Move away of deprecated methods.
* ViewerSorter -> ViewerComparator
* SWT listener to adapter when not every method implemented.
* Non-deprecated IDE.getEditorDescriptor variant.
* DLTKLanguageManager.findToolkit -
DLTKLanguageManager.findToolkitForResource
Change-Id: Ia1873ebd62b61fc3e90ee89f3d3d09907d8e4f9f
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/core/plugins/org.eclipse.dltk.core/model/org/eclipse/dltk/internal/core/util/Util.java b/core/plugins/org.eclipse.dltk.core/model/org/eclipse/dltk/internal/core/util/Util.java
index 2dfea9f..292b934 100644
--- a/core/plugins/org.eclipse.dltk.core/model/org/eclipse/dltk/internal/core/util/Util.java
+++ b/core/plugins/org.eclipse.dltk.core/model/org/eclipse/dltk/internal/core/util/Util.java
@@ -686,7 +686,7 @@
return DLTKContentTypeManager.isValidResourceForContentType(
toolkit, resource);
} else {
- toolkit = DLTKLanguageManager.findToolkit(resource);
+ toolkit = DLTKLanguageManager.findToolkitForResource(resource);
if (toolkit != null) {
return DLTKContentTypeManager.isValidResourceForContentType(
toolkit, resource);
@@ -745,7 +745,8 @@
*/
@Deprecated
public static boolean isValidSourceModule(IResource res) {
- IDLTKLanguageToolkit toolkit = DLTKLanguageManager.findToolkit(res);
+ IDLTKLanguageToolkit toolkit = DLTKLanguageManager
+ .findToolkitForResource(res);
if (toolkit != null) {
return DLTKContentTypeManager.isValidResourceForContentType(
toolkit, res);
diff --git a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/debug/ui/ScriptDebugConsoleGenericHyperlink.java b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/debug/ui/ScriptDebugConsoleGenericHyperlink.java
index 6722e64..c1c72a3 100644
--- a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/debug/ui/ScriptDebugConsoleGenericHyperlink.java
+++ b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/debug/ui/ScriptDebugConsoleGenericHyperlink.java
@@ -113,7 +113,7 @@
public String getEditorId(IEditorInput input, Object inputObject) {
try {
IEditorDescriptor descriptor = IDE
- .getEditorDescriptor(input.getName());
+ .getEditorDescriptor(input.getName(), true, false);
return descriptor.getId();
} catch (PartInitException e) {
return null;
diff --git a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/interpreters/InterpretersBlock.java b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/interpreters/InterpretersBlock.java
index 26181bd..84a3020 100644
--- a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/interpreters/InterpretersBlock.java
+++ b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/interpreters/InterpretersBlock.java
@@ -47,7 +47,7 @@
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
@@ -433,7 +433,7 @@
* Sorts by Interpreter type, and name within type.
*/
private void sortByType() {
- fInterpreterList.setSorter(new ViewerSorter() {
+ fInterpreterList.setComparator(new ViewerComparator() {
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
if ((e1 instanceof IInterpreterInstall)
@@ -465,7 +465,7 @@
* Sorts by Interpreter name.
*/
private void sortByName() {
- fInterpreterList.setSorter(new ViewerSorter() {
+ fInterpreterList.setComparator(new ViewerComparator() {
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
if ((e1 instanceof IInterpreterInstall)
@@ -489,7 +489,7 @@
* Sorts by Interpreter location.
*/
private void sortByLocation() {
- fInterpreterList.setSorter(new ViewerSorter() {
+ fInterpreterList.setComparator(new ViewerComparator() {
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
if ((e1 instanceof IInterpreterInstall)
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/actions/OpenModelElementWithMenu.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/actions/OpenModelElementWithMenu.java
index a7ecdf8..ba71d85 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/actions/OpenModelElementWithMenu.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/actions/OpenModelElementWithMenu.java
@@ -161,11 +161,10 @@
imageDesc = editorDesc.getImageDescriptor();
}
if (imageDesc == null) {
- if (editorDesc.getId().equals(
- IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID)) {
- imageDesc = registry
- .getSystemExternalEditorImageDescriptor(getFileResource()
- .getName());
+ if (editorDesc.getId()
+ .equals(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID)) {
+ imageDesc = registry.getSystemExternalEditorImageDescriptor(
+ getFileResource().getName());
}
}
return imageDesc;
@@ -243,8 +242,8 @@
.findEditor(DEFAULT_TEXT_EDITOR_ID); // may be null
IEditorDescriptor preferredEditor = getDefaultEditor(); // may be null
- IEditorDescriptor[] editors = registry.getEditors(file.getName(), IDE
- .getContentType(file));
+ IEditorDescriptor[] editors = registry.getEditors(file.getName(),
+ IDE.getContentType(file));
Arrays.sort(editors, comparer);
boolean defaultFound = false;
@@ -346,8 +345,7 @@
* Converts the IAdaptable file to IFile or null.
*/
private IFile getFileResource() {
- IResource resource = this.element
- .getAdapter(IResource.class);
+ IResource resource = this.element.getAdapter(IResource.class);
if (resource instanceof IFile) {
return (IFile) resource;
}
@@ -377,15 +375,16 @@
}
try {
if (openUsingDescriptor) {
- ((WorkbenchPage) page)
- .openEditorFromDescriptor(new FileEditorInput(file),
- editorDescriptor, true, null);
+ ((WorkbenchPage) page).openEditorFromDescriptor(
+ new FileEditorInput(file), editorDescriptor, true,
+ null);
} else {
- String editorId = editorDescriptor == null ? IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID
+ String editorId = editorDescriptor == null
+ ? IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID
: editorDescriptor.getId();
- page.openEditor(new FileEditorInput(file),
- editorId, true, MATCH_BOTH);
+ page.openEditor(new FileEditorInput(file), editorId, true,
+ MATCH_BOTH);
// only remember the default editor if the open succeeds
IDE.setDefaultEditor(file, editorId);
}
@@ -422,7 +421,8 @@
if (menuItem.getSelection()) {
IDE.setDefaultEditor(file, null);
try {
- IEditorDescriptor desc1 = IDE.getEditorDescriptor(file);
+ IEditorDescriptor desc1 = IDE.getEditorDescriptor(file,
+ true, false);
page.openEditor(new FileEditorInput(file),
desc1.getId(), true, MATCH_BOTH);
} catch (PartInitException e) {
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/callhierarchy/CallHierarchyViewPart.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/callhierarchy/CallHierarchyViewPart.java
index 72d2f04..c42e5be 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/callhierarchy/CallHierarchyViewPart.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/callhierarchy/CallHierarchyViewPart.java
@@ -52,7 +52,7 @@
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.dnd.Clipboard;
@@ -1022,18 +1022,18 @@
setContentDescription(Messages.format(
CallHierarchyMessages.CallHierarchyViewPart_callsToMethod,
args));
- fCallHierarchyViewer.setSorter(new ViewerSorter()); // bug
- // 111423:
- // sort
- // caller
- // hierarchy
- // alphabetically
+ fCallHierarchyViewer.setComparator(new ViewerComparator()); // bug
+ // 111423:
+ // sort
+ // caller
+ // hierarchy
+ // alphabetically
fCallHierarchyViewer.setMethodWrapper(getCallerRoot());
} else {
setContentDescription(Messages.format(
CallHierarchyMessages.CallHierarchyViewPart_callsFromMethod,
args));
- fCallHierarchyViewer.setSorter(null);
+ fCallHierarchyViewer.setComparator(null);
fCallHierarchyViewer.setMethodWrapper(getCalleeRoot());
}
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/editor/EditorUtility.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/editor/EditorUtility.java
index 75078c1..ded2607 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/editor/EditorUtility.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/editor/EditorUtility.java
@@ -98,8 +98,7 @@
dProject = null;
}
} else if (input instanceof ExternalStorageEditorInput) {
- IModelElement element = input
- .getAdapter(IModelElement.class);
+ IModelElement element = input.getAdapter(IModelElement.class);
if (element != null) {
IScriptProject project = element.getScriptProject();
if (project != null && project.exists()) {
@@ -150,8 +149,8 @@
*
* @return the IEditorPart or null if wrong element type or opening failed
*/
- public static IEditorPart openInEditor(Object inputElement, boolean activate)
- throws ModelException, PartInitException {
+ public static IEditorPart openInEditor(Object inputElement,
+ boolean activate) throws ModelException, PartInitException {
if (inputElement instanceof IFile) {
return openInEditor((IFile) inputElement, activate);
} else if (inputElement instanceof DelegatedOpen) {
@@ -209,13 +208,14 @@
IEditorDescriptor editorDescriptor;
try {
if (input instanceof IFileEditorInput) {
- editorDescriptor = IDE
- .getEditorDescriptor(((IFileEditorInput) input)
- .getFile());
+ editorDescriptor = IDE.getEditorDescriptor(
+ ((IFileEditorInput) input).getFile(), true, false);
} else if (input instanceof ExternalStorageEditorInput) {
- editorDescriptor = IDE.getEditorDescriptor(input.getName());
+ editorDescriptor = IDE.getEditorDescriptor(input.getName(),
+ true, false);
} else {
- editorDescriptor = IDE.getEditorDescriptor(input.getName());
+ editorDescriptor = IDE.getEditorDescriptor(input.getName(),
+ true, false);
}
} catch (PartInitException e) {
@@ -251,8 +251,8 @@
if (input instanceof IFile)
return new FileEditorInput((IFile) input);
if (DLTKCore.DEBUG) {
- System.err
- .println("Add archive entry and external source folder editor input.."); //$NON-NLS-1$
+ System.err.println(
+ "Add archive entry and external source folder editor input.."); //$NON-NLS-1$
}
if (input instanceof IStorage) {
return new ExternalStorageEditorInput((IStorage) input);
@@ -351,8 +351,8 @@
marker = ((IFileEditorInput) input).getFile()
.createMarker(IMarker.TEXT);
marker.setAttribute(IMarker.CHAR_START, offset);
- marker.setAttribute(IMarker.CHAR_END, offset
- + length);
+ marker.setAttribute(IMarker.CHAR_END,
+ offset + length);
gotoMarkerTarget.gotoMarker(marker);
} finally {
if (marker != null)
@@ -369,8 +369,8 @@
// canceled"); //$NON-NLS-1$
}
} else if (input instanceof ExternalStorageEditorInput) {
- System.err
- .println("TODO: Add external storage editor input reveal..."); //$NON-NLS-1$
+ System.err.println(
+ "TODO: Add external storage editor input reveal..."); //$NON-NLS-1$
}
return;
}
@@ -404,13 +404,13 @@
return null;
}
- private static IEditorPart openInEditor(IEditorInput input,
- String editorID, boolean activate) throws PartInitException {
+ private static IEditorPart openInEditor(IEditorInput input, String editorID,
+ boolean activate) throws PartInitException {
if (input != null) {
IWorkbenchPage p = DLTKUIPlugin.getActivePage();
if (p != null) {
- IEditorPart editorPart = p
- .openEditor(input, editorID, activate);
+ IEditorPart editorPart = p.openEditor(input, editorID,
+ activate);
initializeHighlightRange(editorPart);
return editorPart;
}
@@ -420,9 +420,7 @@
private static void initializeHighlightRange(IEditorPart editorPart) {
if (editorPart instanceof ITextEditor) {
- IAction toggleAction = editorPart
- .getEditorSite()
- .getActionBars()
+ IAction toggleAction = editorPart.getEditorSite().getActionBars()
.getGlobalActionHandler(
ITextEditorActionDefinitionIds.TOGGLE_SHOW_SELECTED_ELEMENT_ONLY);
boolean enable = toggleAction != null;
@@ -432,8 +430,8 @@
// PreferenceConstants.EDITOR_SHOW_SEGMENTS);
// else
if (DLTKCore.DEBUG) {
- System.err
- .println("Add initializeHighlightRange support of preferences."); //$NON-NLS-1$
+ System.err.println(
+ "Add initializeHighlightRange support of preferences."); //$NON-NLS-1$
}
enable = enable && toggleAction.isEnabled()
&& toggleAction.isChecked();
@@ -577,8 +575,8 @@
return SWT.SHIFT;
if (modifierName.equalsIgnoreCase(Action.findModifierString(SWT.ALT)))
return SWT.ALT;
- if (modifierName.equalsIgnoreCase(Action
- .findModifierString(SWT.COMMAND)))
+ if (modifierName
+ .equalsIgnoreCase(Action.findModifierString(SWT.COMMAND)))
return SWT.COMMAND;
return 0;
@@ -611,15 +609,12 @@
@Override
public void handleException(Throwable exception) {
- DLTKUIPlugin
- .log(new Status(
- IStatus.ERROR,
- DLTKUIPlugin.PLUGIN_ID,
- IDLTKStatusConstants.EDITOR_CHANGED_REGION_CALCULATION,
- exception.getLocalizedMessage(), exception));
+ DLTKUIPlugin.log(new Status(IStatus.ERROR,
+ DLTKUIPlugin.PLUGIN_ID,
+ IDLTKStatusConstants.EDITOR_CHANGED_REGION_CALCULATION,
+ exception.getLocalizedMessage(), exception));
String msg = DLTKEditorMessages.CompilationUnitDocumentProvider_error_calculatingChangedRegions;
- errorStatus[0] = new Status(
- IStatus.ERROR,
+ errorStatus[0] = new Status(IStatus.ERROR,
DLTKUIPlugin.PLUGIN_ID,
IDLTKStatusConstants.EDITOR_CHANGED_REGION_CALCULATION,
msg, exception);
@@ -641,7 +636,7 @@
IDocument currentDocument = buffer.getDocument();
IDocument oldDocument = ((ITextFileBuffer) fileBufferManager
.getFileStoreFileBuffer(fileStore))
- .getDocument();
+ .getDocument();
result[0] = getChangedLineRegions(oldDocument,
currentDocument);
@@ -708,8 +703,8 @@
int startOffset = startLineRegion.getOffset();
int endOffset = endLineRegion.getOffset()
+ endLineRegion.getLength();
- regions.add(new Region(startOffset, endOffset
- - startOffset));
+ regions.add(new Region(startOffset,
+ endOffset - startOffset));
}
}
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/search/DLTKSearchResultPage.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/search/DLTKSearchResultPage.java
index 16129b0..283b32d 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/search/DLTKSearchResultPage.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/search/DLTKSearchResultPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -43,7 +43,7 @@
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.search.ui.IContextMenuConstants;
import org.eclipse.search.ui.ISearchResultViewPart;
import org.eclipse.search.ui.NewSearchUI;
@@ -70,64 +70,60 @@
import org.eclipse.ui.part.ResourceTransfer;
import org.eclipse.ui.texteditor.ITextEditor;
-public class DLTKSearchResultPage extends AbstractTextSearchViewPage implements IAdaptable {
-
- public static class DecoratorIgnoringViewerSorter extends ViewerSorter {
+public class DLTKSearchResultPage extends AbstractTextSearchViewPage
+ implements IAdaptable {
+
+ public static class DecoratorIgnoringViewerSorter extends ViewerComparator {
private final ILabelProvider fLabelProvider;
public DecoratorIgnoringViewerSorter(ILabelProvider labelProvider) {
super(null); // lazy initialization
- fLabelProvider= labelProvider;
+ fLabelProvider = labelProvider;
}
-
+
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
- String name1= fLabelProvider.getText(e1);
- String name2= fLabelProvider.getText(e2);
- if (name1 == null)
- name1 = "";//$NON-NLS-1$
- if (name2 == null)
- name2 = "";//$NON-NLS-1$
+ String name1 = fLabelProvider.getText(e1);
+ String name2 = fLabelProvider.getText(e2);
+ if (name1 == null)
+ name1 = "";//$NON-NLS-1$
+ if (name2 == null)
+ name2 = "";//$NON-NLS-1$
return getComparator().compare(name1, name2);
- }
-
+ }
+
}
-
+
private static final int DEFAULT_ELEMENT_LIMIT = 1000;
private static final String FALSE = "FALSE"; //$NON-NLS-1$
private static final String TRUE = "TRUE"; //$NON-NLS-1$
- private static final String KEY_GROUPING= "org.eclipse.dltk.search.resultpage.grouping"; //$NON-NLS-1$
- private static final String KEY_SORTING= "org.eclipse.dltk.search.resultpage.sorting"; //$NON-NLS-1$
- private static final String KEY_LIMIT_ENABLED= "org.eclipse.dltk.search.resultpage.limit_enabled"; //$NON-NLS-1$
- private static final String KEY_LIMIT= "org.eclipse.dltk.search.resultpage.limit"; //$NON-NLS-1$
-
- private static final String GROUP_GROUPING= "org.eclipse.dltk.search.resultpage.grouping"; //$NON-NLS-1$
+ private static final String KEY_GROUPING = "org.eclipse.dltk.search.resultpage.grouping"; //$NON-NLS-1$
+ private static final String KEY_SORTING = "org.eclipse.dltk.search.resultpage.sorting"; //$NON-NLS-1$
+ private static final String KEY_LIMIT_ENABLED = "org.eclipse.dltk.search.resultpage.limit_enabled"; //$NON-NLS-1$
+ private static final String KEY_LIMIT = "org.eclipse.dltk.search.resultpage.limit"; //$NON-NLS-1$
+
+ private static final String GROUP_GROUPING = "org.eclipse.dltk.search.resultpage.grouping"; //$NON-NLS-1$
private static final String GROUP_FILTERING = "org.eclipse.dltk.search.resultpage.filtering"; //$NON-NLS-1$
-
+
private NewSearchViewActionGroup fActionGroup;
private DLTKSearchContentProvider fContentProvider;
private int fCurrentSortOrder;
private SortAction fSortByNameAction;
private SortAction fSortByParentName;
private SortAction fSortByPathAction;
-
+
private GroupAction fGroupTypeAction;
private GroupAction fGroupFileAction;
private GroupAction fGroupPackageAction;
private GroupAction fGroupProjectAction;
private int fCurrentGrouping;
-
+
private static final String[] SHOW_IN_TARGETS = new String[] {
DLTKUIPlugin.ID_SCRIPT_EXPLORER, IPageLayout.ID_RES_NAV };
- public static final IShowInTargetList SHOW_IN_TARGET_LIST= new IShowInTargetList() {
- @Override
- public String[] getShowInTargetIds() {
- return SHOW_IN_TARGETS;
- }
- };
-
- private DLTKSearchEditorOpener fEditorOpener= new DLTKSearchEditorOpener();
+ public static final IShowInTargetList SHOW_IN_TARGET_LIST = () -> SHOW_IN_TARGETS;
+
+ private DLTKSearchEditorOpener fEditorOpener = new DLTKSearchEditorOpener();
public DLTKSearchResultPage() {
initSortActions();
@@ -135,69 +131,96 @@
// initFilterActions();
setElementLimit(Integer.valueOf(DEFAULT_ELEMENT_LIMIT));
}
-
+
private void initSortActions() {
- fSortByNameAction= new SortAction(SearchMessages.DLTKSearchResultPage_sortByName, this, SortingLabelProvider.SHOW_ELEMENT_CONTAINER);
- fSortByPathAction= new SortAction(SearchMessages.DLTKSearchResultPage_sortByPath, this, SortingLabelProvider.SHOW_PATH);
- fSortByParentName= new SortAction(SearchMessages.DLTKSearchResultPage_sortByParentName, this, SortingLabelProvider.SHOW_CONTAINER_ELEMENT);
+ fSortByNameAction = new SortAction(
+ SearchMessages.DLTKSearchResultPage_sortByName, this,
+ SortingLabelProvider.SHOW_ELEMENT_CONTAINER);
+ fSortByPathAction = new SortAction(
+ SearchMessages.DLTKSearchResultPage_sortByPath, this,
+ SortingLabelProvider.SHOW_PATH);
+ fSortByParentName = new SortAction(
+ SearchMessages.DLTKSearchResultPage_sortByParentName, this,
+ SortingLabelProvider.SHOW_CONTAINER_ELEMENT);
}
private void initGroupingActions() {
- fGroupProjectAction= new GroupAction(SearchMessages.DLTKSearchResultPage_groupby_project, SearchMessages.DLTKSearchResultPage_groupby_project_tooltip, this, LevelTreeContentProvider.LEVEL_PROJECT);
- DLTKPluginImages.setLocalImageDescriptors(fGroupProjectAction, "prj_mode.png"); //$NON-NLS-1$
- fGroupPackageAction= new GroupAction(SearchMessages.DLTKSearchResultPage_groupby_package, SearchMessages.DLTKSearchResultPage_groupby_package_tooltip, this, LevelTreeContentProvider.LEVEL_PACKAGE);
- DLTKPluginImages.setLocalImageDescriptors(fGroupPackageAction, "package_mode.png"); //$NON-NLS-1$
- fGroupFileAction= new GroupAction(SearchMessages.DLTKSearchResultPage_groupby_file, SearchMessages.DLTKSearchResultPage_groupby_file_tooltip, this, LevelTreeContentProvider.LEVEL_FILE);
- DLTKPluginImages.setLocalImageDescriptors(fGroupFileAction, "file_mode.png"); //$NON-NLS-1$
- fGroupTypeAction= new GroupAction(SearchMessages.DLTKSearchResultPage_groupby_type, SearchMessages.DLTKSearchResultPage_groupby_type_tooltip, this, LevelTreeContentProvider.LEVEL_TYPE);
- DLTKPluginImages.setLocalImageDescriptors(fGroupTypeAction, "type_mode.png"); //$NON-NLS-1$
+ fGroupProjectAction = new GroupAction(
+ SearchMessages.DLTKSearchResultPage_groupby_project,
+ SearchMessages.DLTKSearchResultPage_groupby_project_tooltip,
+ this, LevelTreeContentProvider.LEVEL_PROJECT);
+ DLTKPluginImages.setLocalImageDescriptors(fGroupProjectAction,
+ "prj_mode.png"); //$NON-NLS-1$
+ fGroupPackageAction = new GroupAction(
+ SearchMessages.DLTKSearchResultPage_groupby_package,
+ SearchMessages.DLTKSearchResultPage_groupby_package_tooltip,
+ this, LevelTreeContentProvider.LEVEL_PACKAGE);
+ DLTKPluginImages.setLocalImageDescriptors(fGroupPackageAction,
+ "package_mode.png"); //$NON-NLS-1$
+ fGroupFileAction = new GroupAction(
+ SearchMessages.DLTKSearchResultPage_groupby_file,
+ SearchMessages.DLTKSearchResultPage_groupby_file_tooltip, this,
+ LevelTreeContentProvider.LEVEL_FILE);
+ DLTKPluginImages.setLocalImageDescriptors(fGroupFileAction,
+ "file_mode.png"); //$NON-NLS-1$
+ fGroupTypeAction = new GroupAction(
+ SearchMessages.DLTKSearchResultPage_groupby_type,
+ SearchMessages.DLTKSearchResultPage_groupby_type_tooltip, this,
+ LevelTreeContentProvider.LEVEL_TYPE);
+ DLTKPluginImages.setLocalImageDescriptors(fGroupTypeAction,
+ "type_mode.png"); //$NON-NLS-1$
}
@Override
public void setViewPart(ISearchResultViewPart part) {
super.setViewPart(part);
- fActionGroup= new NewSearchViewActionGroup(part);
+ fActionGroup = new NewSearchViewActionGroup(part);
}
-
+
@Override
- public void showMatch(Match match, int offset, int length, boolean activate) throws PartInitException {
+ public void showMatch(Match match, int offset, int length, boolean activate)
+ throws PartInitException {
IEditorPart editor;
try {
- editor= fEditorOpener.openMatch(match);
+ editor = fEditorOpener.openMatch(match);
} catch (ModelException e) {
throw new PartInitException(e.getStatus());
}
-
+
if (editor != null && activate)
editor.getEditorSite().getPage().activate(editor);
- Object element= match.getElement();
+ Object element = match.getElement();
if (editor instanceof ITextEditor) {
- ITextEditor textEditor= (ITextEditor) editor;
+ ITextEditor textEditor = (ITextEditor) editor;
textEditor.selectAndReveal(offset, length);
- } else if (editor != null){
+ } else if (editor != null) {
if (element instanceof IFile) {
- IFile file= (IFile) element;
+ IFile file = (IFile) element;
showWithMarker(editor, file, offset, length);
}
} else {
- DLTKSearchResult result= (DLTKSearchResult) getInput();
- IMatchPresentation participant= result.getSearchParticpant(element);
+ DLTKSearchResult result = (DLTKSearchResult) getInput();
+ IMatchPresentation participant = result
+ .getSearchParticpant(element);
if (participant != null)
participant.showMatch(match, offset, length, activate);
}
}
-
- private void showWithMarker(IEditorPart editor, IFile file, int offset, int length) throws PartInitException {
+
+ private void showWithMarker(IEditorPart editor, IFile file, int offset,
+ int length) throws PartInitException {
try {
- IMarker marker= file.createMarker(NewSearchUI.SEARCH_MARKER);
- HashMap<String, Integer> attributes= new HashMap<String, Integer>(4);
+ IMarker marker = file.createMarker(NewSearchUI.SEARCH_MARKER);
+ HashMap<String, Integer> attributes = new HashMap<String, Integer>(
+ 4);
attributes.put(IMarker.CHAR_START, Integer.valueOf(offset));
attributes.put(IMarker.CHAR_END, Integer.valueOf(offset + length));
marker.setAttributes(attributes);
IDE.gotoMarker(editor, marker);
marker.delete();
} catch (CoreException e) {
- throw new PartInitException(SearchMessages.DLTKSearchResultPage_error_marker, e);
+ throw new PartInitException(
+ SearchMessages.DLTKSearchResultPage_error_marker, e);
}
}
@@ -206,47 +229,57 @@
super.fillContextMenu(mgr);
addSortActions(mgr);
- fActionGroup.setContext(new ActionContext(getSite().getSelectionProvider().getSelection()));
+ fActionGroup.setContext(new ActionContext(
+ getSite().getSelectionProvider().getSelection()));
fActionGroup.fillContextMenu(mgr);
}
-
+
private void addSortActions(IMenuManager mgr) {
if (getLayout() != FLAG_LAYOUT_FLAT)
return;
- MenuManager sortMenu= new MenuManager(SearchMessages.DLTKSearchResultPage_sortBylabel);
+ MenuManager sortMenu = new MenuManager(
+ SearchMessages.DLTKSearchResultPage_sortBylabel);
sortMenu.add(fSortByNameAction);
sortMenu.add(fSortByPathAction);
sortMenu.add(fSortByParentName);
-
- fSortByNameAction.setChecked(fCurrentSortOrder == fSortByNameAction.getSortOrder());
- fSortByPathAction.setChecked(fCurrentSortOrder == fSortByPathAction.getSortOrder());
- fSortByParentName.setChecked(fCurrentSortOrder == fSortByParentName.getSortOrder());
-
+
+ fSortByNameAction.setChecked(
+ fCurrentSortOrder == fSortByNameAction.getSortOrder());
+ fSortByPathAction.setChecked(
+ fCurrentSortOrder == fSortByPathAction.getSortOrder());
+ fSortByParentName.setChecked(
+ fCurrentSortOrder == fSortByParentName.getSortOrder());
+
mgr.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, sortMenu);
}
-
+
@Override
protected void fillToolbar(IToolBarManager tbm) {
super.fillToolbar(tbm);
if (getLayout() != FLAG_LAYOUT_FLAT)
addGroupActions(tbm);
}
-
+
private void addGroupActions(IToolBarManager mgr) {
- mgr.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, new Separator(GROUP_GROUPING));
+ mgr.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP,
+ new Separator(GROUP_GROUPING));
mgr.appendToGroup(GROUP_GROUPING, fGroupProjectAction);
mgr.appendToGroup(GROUP_GROUPING, fGroupPackageAction);
mgr.appendToGroup(GROUP_GROUPING, fGroupFileAction);
mgr.appendToGroup(GROUP_GROUPING, fGroupTypeAction);
-
+
updateGroupingActions();
}
private void updateGroupingActions() {
- fGroupProjectAction.setChecked(fCurrentGrouping == LevelTreeContentProvider.LEVEL_PROJECT);
- fGroupPackageAction.setChecked(fCurrentGrouping == LevelTreeContentProvider.LEVEL_PACKAGE);
- fGroupFileAction.setChecked(fCurrentGrouping == LevelTreeContentProvider.LEVEL_FILE);
- fGroupTypeAction.setChecked(fCurrentGrouping == LevelTreeContentProvider.LEVEL_TYPE);
+ fGroupProjectAction.setChecked(
+ fCurrentGrouping == LevelTreeContentProvider.LEVEL_PROJECT);
+ fGroupPackageAction.setChecked(
+ fCurrentGrouping == LevelTreeContentProvider.LEVEL_PACKAGE);
+ fGroupFileAction.setChecked(
+ fCurrentGrouping == LevelTreeContentProvider.LEVEL_FILE);
+ fGroupTypeAction.setChecked(
+ fCurrentGrouping == LevelTreeContentProvider.LEVEL_TYPE);
}
@Override
@@ -254,7 +287,7 @@
fActionGroup.dispose();
super.dispose();
}
-
+
@Override
protected void elementsChanged(Object[] objects) {
if (fContentProvider != null)
@@ -266,61 +299,73 @@
if (fContentProvider != null)
fContentProvider.clear();
}
-
+
private void addDragAdapters(StructuredViewer viewer) {
Transfer[] transfers = new Transfer[] {
LocalSelectionTransfer.getTransfer(),
ResourceTransfer.getInstance() };
- int ops= DND.DROP_COPY | DND.DROP_LINK;
-
- DLTKViewerDragAdapter dragAdapter= new DLTKViewerDragAdapter(viewer);
- dragAdapter.addDragSourceListener(new SelectionTransferDragAdapter(viewer));
- dragAdapter.addDragSourceListener(new EditorInputTransferDragAdapter(viewer));
- dragAdapter.addDragSourceListener(new ResourceTransferDragAdapter(viewer));
+ int ops = DND.DROP_COPY | DND.DROP_LINK;
+
+ DLTKViewerDragAdapter dragAdapter = new DLTKViewerDragAdapter(viewer);
+ dragAdapter.addDragSourceListener(
+ new SelectionTransferDragAdapter(viewer));
+ dragAdapter.addDragSourceListener(
+ new EditorInputTransferDragAdapter(viewer));
+ dragAdapter
+ .addDragSourceListener(new ResourceTransferDragAdapter(viewer));
viewer.addDragSupport(ops, transfers, dragAdapter);
- }
+ }
@Override
protected void configureTableViewer(TableViewer viewer) {
viewer.setUseHashlookup(true);
- SortingLabelProvider sortingLabelProvider= new SortingLabelProvider(this);
- viewer.setLabelProvider(new ColorDecoratingLabelProvider(sortingLabelProvider, PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator()));
- fContentProvider=new DLTKSearchTableContentProvider(this);
+ SortingLabelProvider sortingLabelProvider = new SortingLabelProvider(
+ this);
+ viewer.setLabelProvider(new ColorDecoratingLabelProvider(
+ sortingLabelProvider, PlatformUI.getWorkbench()
+ .getDecoratorManager().getLabelDecorator()));
+ fContentProvider = new DLTKSearchTableContentProvider(this);
viewer.setContentProvider(fContentProvider);
- viewer.setSorter(new DecoratorIgnoringViewerSorter(sortingLabelProvider));
+ viewer.setComparator(
+ new DecoratorIgnoringViewerSorter(sortingLabelProvider));
setSortOrder(fCurrentSortOrder);
addDragAdapters(viewer);
}
@Override
protected void configureTreeViewer(TreeViewer viewer) {
- PostfixLabelProvider postfixLabelProvider= new PostfixLabelProvider(this);
+ PostfixLabelProvider postfixLabelProvider = new PostfixLabelProvider(
+ this);
viewer.setUseHashlookup(true);
- viewer.setSorter(new DecoratorIgnoringViewerSorter(postfixLabelProvider));
- viewer.setLabelProvider(new ColorDecoratingLabelProvider(postfixLabelProvider, PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator()));
- fContentProvider= new LevelTreeContentProvider(this, fCurrentGrouping);
+ viewer.setComparator(
+ new DecoratorIgnoringViewerSorter(postfixLabelProvider));
+ viewer.setLabelProvider(new ColorDecoratingLabelProvider(
+ postfixLabelProvider, PlatformUI.getWorkbench()
+ .getDecoratorManager().getLabelDecorator()));
+ fContentProvider = new LevelTreeContentProvider(this, fCurrentGrouping);
viewer.setContentProvider(fContentProvider);
addDragAdapters(viewer);
}
-
+
@Override
protected TreeViewer createTreeViewer(Composite parent) {
- return new ProblemTreeViewer(parent, SWT.MULTI | SWT.H_SCROLL
- | SWT.V_SCROLL);
+ return new ProblemTreeViewer(parent,
+ SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
}
-
+
@Override
protected TableViewer createTableViewer(Composite parent) {
- return new ProblemTableViewer(parent, SWT.MULTI | SWT.H_SCROLL
- | SWT.V_SCROLL);
+ return new ProblemTableViewer(parent,
+ SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
}
-
+
void setSortOrder(int order) {
- fCurrentSortOrder= order;
- StructuredViewer viewer= getViewer();
+ fCurrentSortOrder = order;
+ StructuredViewer viewer = getViewer();
viewer.getControl().setRedraw(false);
- DecoratingLabelProvider dlp= (DecoratingLabelProvider) viewer.getLabelProvider();
- ((SortingLabelProvider)dlp.getLabelProvider()).setOrder(order);
+ DecoratingLabelProvider dlp = (DecoratingLabelProvider) viewer
+ .getLabelProvider();
+ ((SortingLabelProvider) dlp.getLabelProvider()).setOrder(order);
viewer.getControl().setRedraw(true);
viewer.refresh();
getSettings().put(KEY_SORTING, fCurrentSortOrder);
@@ -330,52 +375,64 @@
public void init(IPageSite site) {
super.init(site);
IMenuManager menuManager = site.getActionBars().getMenuManager();
- menuManager.insertBefore(IContextMenuConstants.GROUP_PROPERTIES, new Separator(GROUP_FILTERING));
+ menuManager.insertBefore(IContextMenuConstants.GROUP_PROPERTIES,
+ new Separator(GROUP_FILTERING));
fActionGroup.fillActionBars(site.getActionBars());
- menuManager.appendToGroup(IContextMenuConstants.GROUP_PROPERTIES, new Action(SearchMessages.DLTKSearchResultPage_preferences_label) {
+ menuManager.appendToGroup(IContextMenuConstants.GROUP_PROPERTIES,
+ new Action(
+ SearchMessages.DLTKSearchResultPage_preferences_label) {
@Override
- public void run() {
- String pageId= "org.eclipse.search.preferences.SearchPreferencePage"; //$NON-NLS-1$
- PreferencesUtil.createPreferenceDialogOn(DLTKUIPlugin.getActiveWorkbenchShell(), pageId, null, null).open();
- }
- });
+ public void run() {
+ String pageId = "org.eclipse.search.preferences.SearchPreferencePage"; //$NON-NLS-1$
+ PreferencesUtil.createPreferenceDialogOn(
+ DLTKUIPlugin.getActiveWorkbenchShell(), pageId,
+ null, null).open();
+ }
+ });
}
/**
- * Precondition here: the viewer must be showing a tree with a LevelContentProvider.
+ * Precondition here: the viewer must be showing a tree with a
+ * LevelContentProvider.
+ *
* @param grouping
*/
void setGrouping(int grouping) {
- fCurrentGrouping= grouping;
- StructuredViewer viewer= getViewer();
- LevelTreeContentProvider cp= (LevelTreeContentProvider) viewer.getContentProvider();
+ fCurrentGrouping = grouping;
+ StructuredViewer viewer = getViewer();
+ LevelTreeContentProvider cp = (LevelTreeContentProvider) viewer
+ .getContentProvider();
cp.setLevel(grouping);
updateGroupingActions();
getSettings().put(KEY_GROUPING, fCurrentGrouping);
getViewPart().updateLabel();
}
-
+
@Override
protected StructuredViewer getViewer() {
// override so that it's visible in the package.
return super.getViewer();
}
-
- /* (non-Javadoc)
- * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#restoreState(org.eclipse.ui.IMemento)
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.search.ui.text.AbstractTextSearchViewPage#restoreState(org.
+ * eclipse.ui.IMemento)
*/
@Override
public void restoreState(IMemento memento) {
super.restoreState(memento);
try {
- fCurrentSortOrder= getSettings().getInt(KEY_SORTING);
+ fCurrentSortOrder = getSettings().getInt(KEY_SORTING);
} catch (NumberFormatException e) {
- fCurrentSortOrder= SortingLabelProvider.SHOW_ELEMENT_CONTAINER;
+ fCurrentSortOrder = SortingLabelProvider.SHOW_ELEMENT_CONTAINER;
}
try {
- fCurrentGrouping= getSettings().getInt(KEY_GROUPING);
+ fCurrentGrouping = getSettings().getInt(KEY_GROUPING);
} catch (NumberFormatException e) {
- fCurrentGrouping= LevelTreeContentProvider.LEVEL_PACKAGE;
+ fCurrentGrouping = LevelTreeContentProvider.LEVEL_PACKAGE;
}
int elementLimit = DEFAULT_ELEMENT_LIMIT;
if (FALSE.equals(getSettings().get(KEY_LIMIT_ENABLED))) {
@@ -387,14 +444,14 @@
}
}
if (memento != null) {
- Integer value= memento.getInteger(KEY_GROUPING);
+ Integer value = memento.getInteger(KEY_GROUPING);
if (value != null)
- fCurrentGrouping= value.intValue();
- value= memento.getInteger(KEY_SORTING);
+ fCurrentGrouping = value.intValue();
+ value = memento.getInteger(KEY_SORTING);
if (value != null)
- fCurrentSortOrder= value.intValue();
- boolean limitElements = !FALSE.equals(memento
- .getString(KEY_LIMIT_ENABLED));
+ fCurrentSortOrder = value.intValue();
+ boolean limitElements = !FALSE
+ .equals(memento.getString(KEY_LIMIT_ENABLED));
value = memento.getInteger(KEY_LIMIT);
if (value != null)
elementLimit = limitElements ? value.intValue() : -1;
@@ -402,9 +459,6 @@
setElementLimit(Integer.valueOf(elementLimit));
}
- /* (non-Javadoc)
- * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#saveState(org.eclipse.ui.IMemento)
- */
@Override
public void saveState(IMemento memento) {
super.saveState(memento);
@@ -417,9 +471,9 @@
memento.putString(KEY_LIMIT_ENABLED, FALSE);
memento.putInteger(KEY_LIMIT, getElementLimit().intValue());
}
-
+
private boolean isQueryRunning() {
- AbstractTextSearchResult result= getInput();
+ AbstractTextSearchResult result = getInput();
if (result != null) {
return NewSearchUI.isQueryRunning(result.getQuery());
}
@@ -428,7 +482,7 @@
@Override
public String getLabel() {
- String label= super.getLabel();
+ String label = super.getLabel();
AbstractTextSearchResult input = getInput();
if (input != null && input.getActiveMatchFilters() != null
&& input.getActiveMatchFilters().length > 0) {
@@ -440,58 +494,59 @@
int filteredOut = input.getMatchCount()
- getFilteredMatchCount();
String message = SearchMessages.DLTKSearchResultPage_filteredWithCount_message;
- return Messages.format(message, new Object[] { label,
- String.valueOf(filteredOut) });
+ return Messages.format(message,
+ new Object[] { label, String.valueOf(filteredOut) });
}
}
return label;
}
private int getFilteredMatchCount() {
- StructuredViewer viewer= getViewer();
+ StructuredViewer viewer = getViewer();
if (viewer instanceof TreeViewer) {
- ITreeContentProvider tp= (ITreeContentProvider) viewer.getContentProvider();
+ ITreeContentProvider tp = (ITreeContentProvider) viewer
+ .getContentProvider();
return getMatchCount(tp, getRootElements((TreeViewer) getViewer()));
} else {
return getMatchCount((TableViewer) viewer);
}
}
-
+
private Object[] getRootElements(TreeViewer viewer) {
- Tree t= viewer.getTree();
- Item[] roots= t.getItems();
- Object[] elements= new Object[roots.length];
+ Tree t = viewer.getTree();
+ Item[] roots = t.getItems();
+ Object[] elements = new Object[roots.length];
for (int i = 0; i < elements.length; i++) {
- elements[i]= roots[i].getData();
+ elements[i] = roots[i].getData();
}
return elements;
}
-
+
private Object[] getRootElements(TableViewer viewer) {
- Table t= viewer.getTable();
- Item[] roots= t.getItems();
- Object[] elements= new Object[roots.length];
+ Table t = viewer.getTable();
+ Item[] roots = t.getItems();
+ Object[] elements = new Object[roots.length];
for (int i = 0; i < elements.length; i++) {
- elements[i]= roots[i].getData();
+ elements[i] = roots[i].getData();
}
return elements;
}
private int getMatchCount(ITreeContentProvider cp, Object[] elements) {
- int count= 0;
+ int count = 0;
for (int j = 0; j < elements.length; j++) {
- count+= getDisplayedMatchCount(elements[j]);
+ count += getDisplayedMatchCount(elements[j]);
Object[] children = cp.getChildren(elements[j]);
- count+= getMatchCount(cp, children);
+ count += getMatchCount(cp, children);
}
return count;
}
-
+
private int getMatchCount(TableViewer viewer) {
- Object[] elements= getRootElements(viewer);
- int count= 0;
+ Object[] elements = getRootElements(viewer);
+ int count = 0;
for (int i = 0; i < elements.length; i++) {
- count+= getDisplayedMatchCount(elements[i]);
+ count += getDisplayedMatchCount(elements[i]);
}
return count;
}
@@ -504,17 +559,20 @@
}
return null;
}
-
+
@Override
protected void handleOpen(OpenEvent event) {
- Object firstElement= ((IStructuredSelection)event.getSelection()).getFirstElement();
- if (firstElement instanceof ISourceModule ||
- firstElement instanceof IMember) {
+ Object firstElement = ((IStructuredSelection) event.getSelection())
+ .getFirstElement();
+ if (firstElement instanceof ISourceModule
+ || firstElement instanceof IMember) {
if (getDisplayedMatchCount(firstElement) == 0) {
try {
fEditorOpener.openElement(firstElement);
} catch (CoreException e) {
- ExceptionHandler.handle(e, getSite().getShell(), SearchMessages.DLTKSearchResultPage_open_editor_error_title, SearchMessages.DLTKSearchResultPage_open_editor_error_message);
+ ExceptionHandler.handle(e, getSite().getShell(),
+ SearchMessages.DLTKSearchResultPage_open_editor_error_title,
+ SearchMessages.DLTKSearchResultPage_open_editor_error_message);
}
return;
}
@@ -528,5 +586,5 @@
int limit = elementLimit.intValue();
getSettings().put(KEY_LIMIT, limit);
getSettings().put(KEY_LIMIT_ENABLED, limit != -1 ? TRUE : FALSE);
- }
+ }
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/AbstractInformationControl.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/AbstractInformationControl.java
index 2bbf10b..4df0905 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/AbstractInformationControl.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/AbstractInformationControl.java
@@ -37,13 +37,13 @@
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseMoveListener;
+import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.FontMetrics;
import org.eclipse.swt.graphics.GC;
@@ -75,8 +75,8 @@
*
*
*/
-public abstract class AbstractInformationControl extends PopupDialog implements
- IInformationControl, IInformationControlExtension,
+public abstract class AbstractInformationControl extends PopupDialog
+ implements IInformationControl, IInformationControlExtension,
IInformationControlExtension2, DisposeListener {
/**
@@ -165,7 +165,7 @@
*/
public AbstractInformationControl(Shell parent, int shellStyle,
int treeStyle, String invokingCommandId, boolean showStatusField) {
- super(parent, shellStyle, true, true, true, true, null, null);
+ super(parent, shellStyle, true, true, true, true, true, null, null);
if (invokingCommandId != null) {
ICommandManager commandManager = PlatformUI.getWorkbench()
.getCommandSupport().getCommandManager();
@@ -182,7 +182,7 @@
// force empty values here.
if (hasHeader())
setTitleText(""); //$NON-NLS-1$
- setInfoText(""); // //$NON-NLS-1$
+ setInfoText(""); // //$NON-NLS-1$
// Create all controls early to preserve the life cycle of the original
// implementation.
@@ -219,25 +219,15 @@
fTreeViewer);
final Tree tree = fTreeViewer.getTree();
- tree.addKeyListener(new KeyListener() {
+ tree.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
if (e.character == 0x1B) // ESC
dispose();
}
-
- @Override
- public void keyReleased(KeyEvent e) {
- // do nothing
- }
});
- tree.addSelectionListener(new SelectionListener() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- // do nothing
- }
-
+ tree.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetDefaultSelected(SelectionEvent e) {
gotoSelectedElement();
@@ -364,7 +354,7 @@
data.verticalAlignment = GridData.CENTER;
fFilterText.setLayoutData(data);
- fFilterText.addKeyListener(new KeyListener() {
+ fFilterText.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
if (e.keyCode == 0x0D) // return
@@ -376,19 +366,14 @@
if (e.character == 0x1B) // ESC
dispose();
}
-
- @Override
- public void keyReleased(KeyEvent e) {
- // do nothing
- }
});
return fFilterText;
}
protected void createHorizontalSeparator(Composite parent) {
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL
- | SWT.LINE_DOT);
+ Label separator = new Label(parent,
+ SWT.SEPARATOR | SWT.HORIZONTAL | SWT.LINE_DOT);
separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
}
@@ -522,17 +507,11 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setInformation(String information) {
// this method is ignored, see IInformationControlExtension2
}
- /**
- * {@inheritDoc}
- */
@Override
public abstract void setInput(Object information);
@@ -566,9 +545,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void setVisible(boolean visible) {
if (visible) {
@@ -582,9 +558,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public final void dispose() {
close();
@@ -616,18 +589,18 @@
// Remember current scope and then set window context.
if (fKeyBindingScopes == null && fKeyBindingService != null) {
fKeyBindingScopes = fKeyBindingService.getScopes();
- fKeyBindingService
- .setScopes(new String[] { IWorkbenchContextSupport.CONTEXT_ID_WINDOW });
+ fKeyBindingService.setScopes(new String[] {
+ IWorkbenchContextSupport.CONTEXT_ID_WINDOW });
}
// Register action with command support
if (fShowViewMenuHandlerSubmission == null) {
fShowViewMenuHandlerSubmission = new HandlerSubmission(null,
- getShell(), null, fShowViewMenuAction
- .getActionDefinitionId(), new ActionHandler(
- fShowViewMenuAction), Priority.MEDIUM);
- PlatformUI.getWorkbench().getCommandSupport().addHandlerSubmission(
- fShowViewMenuHandlerSubmission);
+ getShell(), null,
+ fShowViewMenuAction.getActionDefinitionId(),
+ new ActionHandler(fShowViewMenuAction), Priority.MEDIUM);
+ PlatformUI.getWorkbench().getCommandSupport()
+ .addHandlerSubmission(fShowViewMenuHandlerSubmission);
}
}
@@ -649,25 +622,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasContents() {
return fTreeViewer != null && fTreeViewer.getInput() != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setSizeConstraints(int maxWidth, int maxHeight) {
// ignore
}
- /**
- * {@inheritDoc}
- */
@Override
public Point computeSizeHint() {
// return the shell's size - note that it already has the persisted size
@@ -676,9 +640,6 @@
return getShell().getSize();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setLocation(Point location) {
/*
@@ -770,8 +731,8 @@
protected IDialogSettings getDialogSettings() {
String sectionName = getId();
- IDialogSettings settings = DLTKUIPlugin.getDefault()
- .getDialogSettings().getSection(sectionName);
+ IDialogSettings settings = DLTKUIPlugin.getDefault().getDialogSettings()
+ .getSection(sectionName);
if (settings == null)
settings = DLTKUIPlugin.getDefault().getDialogSettings()
.addNewSection(sectionName);
@@ -784,8 +745,8 @@
*/
@Override
protected Control createTitleMenuArea(Composite parent) {
- fViewMenuButtonComposite = (Composite) super
- .createTitleMenuArea(parent);
+ fViewMenuButtonComposite = (Composite) super.createTitleMenuArea(
+ parent);
// If there is a header, then the filter text must be created
// underneath the title and menu area.
@@ -835,8 +796,8 @@
@Override
protected void setTabOrder(Composite composite) {
if (hasHeader()) {
- composite.setTabList(new Control[] { fFilterText,
- fTreeViewer.getTree() });
+ composite.setTabList(
+ new Control[] { fFilterText, fTreeViewer.getTree() });
} else {
fViewMenuButtonComposite.setTabList(new Control[] { fFilterText });
composite.setTabList(new Control[] { fViewMenuButtonComposite,
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/AbstractHierarchyViewerSorter.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/AbstractHierarchyViewerSorter.java
index 537fdef..309cf25 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/AbstractHierarchyViewerSorter.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/AbstractHierarchyViewerSorter.java
@@ -16,9 +16,9 @@
import org.eclipse.dltk.ui.ModelElementSorter;
import org.eclipse.dltk.ui.viewsupport.SourcePositionSorter;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
-public abstract class AbstractHierarchyViewerSorter extends ViewerSorter {
+public abstract class AbstractHierarchyViewerSorter extends ViewerComparator {
private static final int OTHER = 10;
private static final int CLASS = 20;
@@ -80,9 +80,11 @@
if (cat1 == OTHER) { // method or field
if (isSortByDefiningType()) {
try {
- IType def1 = (e1 instanceof IMethod) ? getDefiningType((IMethod) e1)
+ IType def1 = (e1 instanceof IMethod)
+ ? getDefiningType((IMethod) e1)
: null;
- IType def2 = (e2 instanceof IMethod) ? getDefiningType((IMethod) e2)
+ IType def2 = (e2 instanceof IMethod)
+ ? getDefiningType((IMethod) e2)
: null;
if (def1 != null) {
if (def2 != null) {
@@ -151,14 +153,15 @@
private int compareInHierarchy(IType def1, IType def2) {
if (ScriptModelUtil.isSuperType(getHierarchy(def1), def2, def1)) {
return 1;
- } else if (ScriptModelUtil.isSuperType(getHierarchy(def2), def1, def2)) {
+ } else if (ScriptModelUtil.isSuperType(getHierarchy(def2), def1,
+ def2)) {
return -1;
}
String name1 = def1.getElementName();
String name2 = def2.getElementName();
- return getCollator().compare(name1, name2);
+ return getComparator().compare(name1, name2);
}
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/HierarchyInformationControl.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/HierarchyInformationControl.java
index bb11fcc..a1dc749 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/HierarchyInformationControl.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/HierarchyInformationControl.java
@@ -47,7 +47,8 @@
*
* @since 3.0
*/
-public abstract class HierarchyInformationControl extends AbstractInformationControl {
+public abstract class HierarchyInformationControl
+ extends AbstractInformationControl {
private TypeHierarchyLifeCycle fLifeCycle;
private HierarchyLabelProvider fLabelProvider;
@@ -61,27 +62,32 @@
private MethodOverrideTester fMethodOverrideTester;
- public HierarchyInformationControl(Shell parent, int shellStyle, int treeStyle) {
- super(parent, shellStyle, treeStyle, IScriptEditorActionDefinitionIds.OPEN_HIERARCHY, true);
- fOtherExpandedElements= null;
- fDoFilter= true;
- fMethodOverrideTester= null;
+ public HierarchyInformationControl(Shell parent, int shellStyle,
+ int treeStyle) {
+ super(parent, shellStyle, treeStyle,
+ IScriptEditorActionDefinitionIds.OPEN_HIERARCHY, true);
+ fOtherExpandedElements = null;
+ fDoFilter = true;
+ fMethodOverrideTester = null;
}
private KeyAdapter getKeyAdapter() {
if (fKeyAdapter == null) {
- fKeyAdapter= new KeyAdapter() {
+ fKeyAdapter = new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
- int accelerator = SWTKeySupport.convertEventToUnmodifiedAccelerator(e);
- KeySequence keySequence = KeySequence.getInstance(SWTKeySupport.convertAcceleratorToKeyStroke(accelerator));
- KeySequence[] sequences= getInvokingCommandKeySequences();
+ int accelerator = SWTKeySupport
+ .convertEventToUnmodifiedAccelerator(e);
+ KeySequence keySequence = KeySequence.getInstance(
+ SWTKeySupport.convertAcceleratorToKeyStroke(
+ accelerator));
+ KeySequence[] sequences = getInvokingCommandKeySequences();
if (sequences == null)
return;
- for (int i= 0; i < sequences.length; i++) {
+ for (int i = 0; i < sequences.length; i++) {
if (sequences[i].equals(keySequence)) {
- e.doit= false;
+ e.doit = false;
toggleHierarchy();
return;
}
@@ -103,41 +109,45 @@
@Override
protected Text createFilterText(Composite parent) {
// text set later
- Text text= super.createFilterText(parent);
+ Text text = super.createFilterText(parent);
text.addKeyListener(getKeyAdapter());
return text;
}
-
@Override
protected TreeViewer createTreeViewer(Composite parent, int style) {
- Tree tree= new Tree(parent, SWT.SINGLE | (style & ~SWT.MULTI));
- GridData gd= new GridData(GridData.FILL_BOTH);
- gd.heightHint= tree.getItemHeight() * 12;
+ Tree tree = new Tree(parent, SWT.SINGLE | (style & ~SWT.MULTI));
+ GridData gd = new GridData(GridData.FILL_BOTH);
+ gd.heightHint = tree.getItemHeight() * 12;
tree.setLayoutData(gd);
- TreeViewer treeViewer= new TreeViewer(tree);
+ TreeViewer treeViewer = new TreeViewer(tree);
treeViewer.addFilter(new ViewerFilter() {
@Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- return element instanceof IType || element instanceof CumulativeType;
+ public boolean select(Viewer viewer, Object parentElement,
+ Object element) {
+ return element instanceof IType
+ || element instanceof CumulativeType;
}
});
- fLifeCycle= new TypeHierarchyLifeCycle(false);
+ fLifeCycle = new TypeHierarchyLifeCycle(false);
- treeViewer.setSorter(new HierarchyViewerSorter(fLifeCycle));
+ treeViewer.setComparator(new HierarchyViewerSorter(fLifeCycle));
treeViewer.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
- fLabelProvider= new HierarchyLabelProvider(fLifeCycle, getPreferenceStore ());
+ fLabelProvider = new HierarchyLabelProvider(fLifeCycle,
+ getPreferenceStore());
fLabelProvider.setFilter(new ViewerFilter() {
@Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
+ public boolean select(Viewer viewer, Object parentElement,
+ Object element) {
return hasFocusMethod((IType) element);
}
});
- fLabelProvider.setTextFlags(ScriptElementLabels.ALL_DEFAULT | ScriptElementLabels.T_POST_QUALIFIED);
+ fLabelProvider.setTextFlags(ScriptElementLabels.ALL_DEFAULT
+ | ScriptElementLabels.T_POST_QUALIFIED);
fLabelProvider.addLabelDecorator(new ProblemsLabelDecorator(null));
treeViewer.setLabelProvider(fLabelProvider);
@@ -157,13 +167,14 @@
}
try {
- IMethod method= findMethod(fFocus, type);
+ IMethod method = findMethod(fFocus, type);
if (method != null) {
// check visibility
-// IProjectFragment pack= (IProjectFragment) fFocus.getAncestor(IModelElement.PROJECT_FRAGMENT);
-// if (DLTKModelUtil.isVisibleInHierarchy(method, pack)) {
-// return true;
-// }
+ // IProjectFragment pack= (IProjectFragment)
+ // fFocus.getAncestor(IModelElement.PROJECT_FRAGMENT);
+ // if (DLTKModelUtil.isVisibleInHierarchy(method, pack)) {
+ // return true;
+ // }
return true;
}
} catch (ModelException e) {
@@ -174,21 +185,27 @@
}
- private IMethod findMethod(IMethod filterMethod, IType typeToFindIn) throws ModelException {
- IType filterType= filterMethod.getDeclaringType();
- ITypeHierarchy hierarchy= fLifeCycle.getHierarchy();
+ private IMethod findMethod(IMethod filterMethod, IType typeToFindIn)
+ throws ModelException {
+ IType filterType = filterMethod.getDeclaringType();
+ ITypeHierarchy hierarchy = fLifeCycle.getHierarchy();
- boolean filterOverrides= ScriptModelUtil.isSuperType(hierarchy, typeToFindIn, filterType);
- IType focusType= filterOverrides ? filterType : typeToFindIn;
+ boolean filterOverrides = ScriptModelUtil.isSuperType(hierarchy,
+ typeToFindIn, filterType);
+ IType focusType = filterOverrides ? filterType : typeToFindIn;
- if (fMethodOverrideTester == null || !fMethodOverrideTester.getFocusType().equals(focusType)) {
- fMethodOverrideTester= new MethodOverrideTester(focusType, hierarchy);
+ if (fMethodOverrideTester == null
+ || !fMethodOverrideTester.getFocusType().equals(focusType)) {
+ fMethodOverrideTester = new MethodOverrideTester(focusType,
+ hierarchy);
}
if (filterOverrides) {
- return fMethodOverrideTester.findOverriddenMethodInType(typeToFindIn, filterMethod);
+ return fMethodOverrideTester
+ .findOverriddenMethodInType(typeToFindIn, filterMethod);
} else {
- return fMethodOverrideTester.findOverridingMethodInType(typeToFindIn, filterMethod);
+ return fMethodOverrideTester
+ .findOverridingMethodInType(typeToFindIn, filterMethod);
}
}
@@ -198,35 +215,37 @@
inputChanged(null, null);
return;
}
- IModelElement input= null;
- IMethod locked= null;
+ IModelElement input = null;
+ IMethod locked = null;
try {
- IModelElement elem= (IModelElement) information;
+ IModelElement elem = (IModelElement) information;
switch (elem.getElementType()) {
- case IModelElement.SCRIPT_PROJECT :
- case IModelElement.PROJECT_FRAGMENT :
- case IModelElement.TYPE :
- case IModelElement.SOURCE_MODULE :
- input= elem;
- break;
+ case IModelElement.SCRIPT_PROJECT:
+ case IModelElement.PROJECT_FRAGMENT:
+ case IModelElement.TYPE:
+ case IModelElement.SOURCE_MODULE:
+ input = elem;
+ break;
- case IModelElement.METHOD :
- IMethod method= (IMethod) elem;
- if (!method.isConstructor()) {
- locked= method;
- }
- input= method.getDeclaringType();
- break;
- case IModelElement.FIELD :
- input= ((IMember) elem).getDeclaringType();
- break;
- case IModelElement.PACKAGE_DECLARATION :
- input= elem.getParent().getParent();
- break;
- default :
- DLTKUIPlugin.logErrorMessage("Element unsupported by the hierarchy: " + elem.getClass()); //$NON-NLS-1$
- input= null;
+ case IModelElement.METHOD:
+ IMethod method = (IMethod) elem;
+ if (!method.isConstructor()) {
+ locked = method;
+ }
+ input = method.getDeclaringType();
+ break;
+ case IModelElement.FIELD:
+ input = ((IMember) elem).getDeclaringType();
+ break;
+ case IModelElement.PACKAGE_DECLARATION:
+ input = elem.getParent().getParent();
+ break;
+ default:
+ DLTKUIPlugin.logErrorMessage(
+ "Element unsupported by the hierarchy: " //$NON-NLS-1$
+ + elem.getClass());
+ input = null;
}
} catch (ModelException e) {
DLTKUIPlugin.log(e);
@@ -234,36 +253,41 @@
super.setTitleText(getHeaderLabel(locked == null ? input : locked));
try {
- fLifeCycle.ensureRefreshedTypeHierarchy(input, DLTKUIPlugin.getActiveWorkbenchWindow());
+ fLifeCycle.ensureRefreshedTypeHierarchy(input,
+ DLTKUIPlugin.getActiveWorkbenchWindow());
} catch (InvocationTargetException e1) {
- input= null;
+ input = null;
} catch (InterruptedException e1) {
dispose();
return;
}
- IMember[] memberFilter= locked != null ? new IMember[] { locked } : null;
+ IMember[] memberFilter = locked != null ? new IMember[] { locked }
+ : null;
- TraditionalHierarchyContentProvider contentProvider= new TraditionalHierarchyContentProvider(fLifeCycle);
+ TraditionalHierarchyContentProvider contentProvider = new TraditionalHierarchyContentProvider(
+ fLifeCycle);
contentProvider.setMemberFilter(memberFilter);
getTreeViewer().setContentProvider(contentProvider);
- fOtherContentProvider= new SuperTypeHierarchyContentProvider(fLifeCycle);
+ fOtherContentProvider = new SuperTypeHierarchyContentProvider(
+ fLifeCycle);
fOtherContentProvider.setMemberFilter(memberFilter);
- fFocus= locked;
+ fFocus = locked;
- Object[] topLevelObjects= contentProvider.getElements(fLifeCycle);
- if (topLevelObjects.length > 0 && contentProvider.getChildren(topLevelObjects[0]).length > 40) {
- fDoFilter= false;
+ Object[] topLevelObjects = contentProvider.getElements(fLifeCycle);
+ if (topLevelObjects.length > 0 && contentProvider
+ .getChildren(topLevelObjects[0]).length > 40) {
+ fDoFilter = false;
} else {
getTreeViewer().addFilter(new NamePatternFilter());
}
- Object selection= null;
+ Object selection = null;
if (input instanceof IMember) {
- selection= input;
+ selection = input;
} else if (topLevelObjects.length > 0) {
- selection= topLevelObjects[0];
+ selection = topLevelObjects[0];
}
inputChanged(fLifeCycle, selection);
}
@@ -278,12 +302,13 @@
}
protected void toggleHierarchy() {
- TreeViewer treeViewer= getTreeViewer();
+ TreeViewer treeViewer = getTreeViewer();
treeViewer.getTree().setRedraw(false);
- Object[] expandedElements= treeViewer.getExpandedElements();
- TypeHierarchyContentProvider contentProvider= (TypeHierarchyContentProvider) treeViewer.getContentProvider();
+ Object[] expandedElements = treeViewer.getExpandedElements();
+ TypeHierarchyContentProvider contentProvider = (TypeHierarchyContentProvider) treeViewer
+ .getContentProvider();
treeViewer.setContentProvider(fOtherContentProvider);
treeViewer.refresh();
@@ -295,22 +320,26 @@
treeViewer.getTree().setRedraw(true);
- fOtherContentProvider= contentProvider;
- fOtherExpandedElements= expandedElements;
+ fOtherContentProvider = contentProvider;
+ fOtherExpandedElements = expandedElements;
updateStatusFieldText();
}
-
private String getHeaderLabel(IModelElement input) {
if (input instanceof IMethod) {
- String[] args= { input.getParent().getElementName(),
- ScriptElementLabels.getDefault().getElementLabel(input, ScriptElementLabels.ALL_DEFAULT) };
- return Messages.format(TypeHierarchyMessages.HierarchyInformationControl_methodhierarchy_label, args);
+ String[] args = { input.getParent().getElementName(),
+ ScriptElementLabels.getDefault().getElementLabel(input,
+ ScriptElementLabels.ALL_DEFAULT) };
+ return Messages.format(
+ TypeHierarchyMessages.HierarchyInformationControl_methodhierarchy_label,
+ args);
} else if (input != null) {
- String arg=
- ScriptElementLabels.getDefault().getElementLabel(input, ScriptElementLabels.DEFAULT_QUALIFIED);
- return Messages.format(TypeHierarchyMessages.HierarchyInformationControl_hierarchy_label, arg);
+ String arg = ScriptElementLabels.getDefault().getElementLabel(input,
+ ScriptElementLabels.DEFAULT_QUALIFIED);
+ return Messages.format(
+ TypeHierarchyMessages.HierarchyInformationControl_hierarchy_label,
+ arg);
} else {
return ""; //$NON-NLS-1$
}
@@ -318,15 +347,19 @@
@Override
protected String getStatusFieldText() {
- KeySequence[] sequences= getInvokingCommandKeySequences();
- String keyName= ""; //$NON-NLS-1$
+ KeySequence[] sequences = getInvokingCommandKeySequences();
+ String keyName = ""; //$NON-NLS-1$
if (sequences != null && sequences.length > 0)
- keyName= sequences[0].format();
+ keyName = sequences[0].format();
if (fOtherContentProvider instanceof TraditionalHierarchyContentProvider) {
- return Messages.format(TypeHierarchyMessages.HierarchyInformationControl_toggle_traditionalhierarchy_label, keyName);
+ return Messages.format(
+ TypeHierarchyMessages.HierarchyInformationControl_toggle_traditionalhierarchy_label,
+ keyName);
} else {
- return Messages.format(TypeHierarchyMessages.HierarchyInformationControl_toggle_superhierarchy_label, keyName);
+ return Messages.format(
+ TypeHierarchyMessages.HierarchyInformationControl_toggle_superhierarchy_label,
+ keyName);
}
}
@@ -337,9 +370,9 @@
@Override
protected Object getSelectedElement() {
- Object selectedElement= super.getSelectedElement();
+ Object selectedElement = super.getSelectedElement();
if (selectedElement instanceof IType && fFocus != null) {
- IType type= (IType) selectedElement;
+ IType type = (IType) selectedElement;
try {
return findMethod(fFocus, type);
} catch (ModelException e) {
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/MethodsViewer.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/MethodsViewer.java
index 9d2505d..ebdddf1 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/MethodsViewer.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/MethodsViewer.java
@@ -38,15 +38,14 @@
import org.eclipse.ui.IWorkbenchPartSite;
/**
- * Method viewer shows a list of methods of a input type.
- * Offers filter actions.
+ * Method viewer shows a list of methods of a input type. Offers filter actions.
* No dependency to the type hierarchy view
*/
public class MethodsViewer extends ProblemTableViewer {
- private static final String TAG_SHOWINHERITED= "showinherited"; //$NON-NLS-1$
- private static final String TAG_SORTBYDEFININGTYPE= "sortbydefiningtype"; //$NON-NLS-1$
- private static final String TAG_VERTICAL_SCROLL= "mv_vertical_scroll"; //$NON-NLS-1$
+ private static final String TAG_SHOWINHERITED = "showinherited"; //$NON-NLS-1$
+ private static final String TAG_SORTBYDEFININGTYPE = "sortbydefiningtype"; //$NON-NLS-1$
+ private static final String TAG_VERTICAL_SCROLL = "mv_vertical_scroll"; //$NON-NLS-1$
private MethodsLabelProvider fLabelProvider;
@@ -56,48 +55,54 @@
private ShowInheritedMembersAction fShowInheritedMembersAction;
private SortByDefiningTypeAction fSortByDefiningTypeAction;
-
public MethodsViewer(Composite parent,
- final TypeHierarchyLifeCycle lifeCycle, IWorkbenchPart part, IPreferenceStore store) {
+ final TypeHierarchyLifeCycle lifeCycle, IWorkbenchPart part,
+ IPreferenceStore store) {
super(new Table(parent, SWT.MULTI));
- fLabelProvider= new MethodsLabelProvider(lifeCycle, this, store);
+ fLabelProvider = new MethodsLabelProvider(lifeCycle, this, store);
- setLabelProvider(new StyledDecoratingModelLabelProvider(fLabelProvider,
- true));
+ setLabelProvider(
+ new StyledDecoratingModelLabelProvider(fLabelProvider, true));
setContentProvider(new MethodsContentProvider(lifeCycle));
- HierarchyViewerSorter sorter= new HierarchyViewerSorter(lifeCycle);
+ HierarchyViewerSorter sorter = new HierarchyViewerSorter(lifeCycle);
sorter.setSortByDefiningType(false);
- setSorter(sorter);
+ setComparator(sorter);
- fOpen= new OpenAction(part.getSite());
+ fOpen = new OpenAction(part.getSite());
addOpenListener(event -> fOpen.run());
fMemberFilterActionGroup = new MemberFilterActionGroup(this, store);
-// fMemberFilterActionGroup.setActions(new MemberFilterAction[0]);
+ // fMemberFilterActionGroup.setActions(new MemberFilterAction[0]);
-/* fMemberFilterActionGroup= new MemberFilterActionGroup(this, "HierarchyMethodView", false,
-emberFilterActionGroup.ALL_FILTERS & ~MemberFilterActionGroup.FILTER_LOCALTYPES); //$NON-NLS-1$*/
+ /*
+ * fMemberFilterActionGroup= new MemberFilterActionGroup(this,
+ * "HierarchyMethodView", false, emberFilterActionGroup.ALL_FILTERS &
+ * ~MemberFilterActionGroup.FILTER_LOCALTYPES); //$NON-NLS-1$
+ */
- fShowInheritedMembersAction= new ShowInheritedMembersAction(this, false);
- fSortByDefiningTypeAction= new SortByDefiningTypeAction(this, false);
+ fShowInheritedMembersAction = new ShowInheritedMembersAction(this,
+ false);
+ fSortByDefiningTypeAction = new SortByDefiningTypeAction(this, false);
showInheritedMethodsNoRedraw(false);
sortByDefiningTypeNoRedraw(false);
- //JavaUIHelp.setHelp(this, IJavaHelpContextIds.TYPE_HIERARCHY_VIEW);
+ // JavaUIHelp.setHelp(this, IJavaHelpContextIds.TYPE_HIERARCHY_VIEW);
}
private void showInheritedMethodsNoRedraw(boolean on) {
- MethodsContentProvider cprovider= (MethodsContentProvider) getContentProvider();
+ MethodsContentProvider cprovider = (MethodsContentProvider) getContentProvider();
cprovider.showInheritedMethods(on);
fShowInheritedMembersAction.setChecked(on);
if (on) {
- fLabelProvider.setTextFlags(fLabelProvider.getTextFlags() | ScriptElementLabels.ALL_POST_QUALIFIED);
+ fLabelProvider.setTextFlags(fLabelProvider.getTextFlags()
+ | ScriptElementLabels.ALL_POST_QUALIFIED);
} else {
- fLabelProvider.setTextFlags(fLabelProvider.getTextFlags() & ~ScriptElementLabels.ALL_POST_QUALIFIED);
+ fLabelProvider.setTextFlags(fLabelProvider.getTextFlags()
+ & ~ScriptElementLabels.ALL_POST_QUALIFIED);
}
if (on) {
sortByDefiningTypeNoRedraw(false);
@@ -125,7 +130,7 @@
private void sortByDefiningTypeNoRedraw(boolean on) {
fSortByDefiningTypeAction.setChecked(on);
fLabelProvider.setShowDefiningType(on);
- ((HierarchyViewerSorter) getSorter()).setSortByDefiningType(on);
+ ((HierarchyViewerSorter) getComparator()).setSortByDefiningType(on);
}
/**
@@ -153,7 +158,8 @@
* Returns <code>true</code> if inherited methods are shown.
*/
public boolean isShowInheritedMethods() {
- return ((MethodsContentProvider) getContentProvider()).isShowInheritedMethods();
+ return ((MethodsContentProvider) getContentProvider())
+ .isShowInheritedMethods();
}
/**
@@ -169,11 +175,13 @@
public void saveState(IMemento memento) {
fMemberFilterActionGroup.saveState(memento);
- memento.putString(TAG_SHOWINHERITED, String.valueOf(isShowInheritedMethods()));
- memento.putString(TAG_SORTBYDEFININGTYPE, String.valueOf(isShowDefiningTypes()));
+ memento.putString(TAG_SHOWINHERITED,
+ String.valueOf(isShowInheritedMethods()));
+ memento.putString(TAG_SORTBYDEFININGTYPE,
+ String.valueOf(isShowDefiningTypes()));
- ScrollBar bar= getTable().getVerticalBar();
- int position= bar != null ? bar.getSelection() : 0;
+ ScrollBar bar = getTable().getVerticalBar();
+ int position = bar != null ? bar.getSelection() : 0;
memento.putString(TAG_VERTICAL_SCROLL, String.valueOf(position));
}
@@ -186,15 +194,18 @@
refresh();
getControl().setRedraw(true);
- boolean showInherited= Boolean.valueOf(memento.getString(TAG_SHOWINHERITED)).booleanValue();
+ boolean showInherited = Boolean
+ .valueOf(memento.getString(TAG_SHOWINHERITED)).booleanValue();
showInheritedMethods(showInherited);
- boolean showDefiningTypes= Boolean.valueOf(memento.getString(TAG_SORTBYDEFININGTYPE)).booleanValue();
+ boolean showDefiningTypes = Boolean
+ .valueOf(memento.getString(TAG_SORTBYDEFININGTYPE))
+ .booleanValue();
sortByDefiningType(showDefiningTypes);
- ScrollBar bar= getTable().getVerticalBar();
+ ScrollBar bar = getTable().getVerticalBar();
if (bar != null) {
- Integer vScroll= memento.getInteger(TAG_VERTICAL_SCROLL);
+ Integer vScroll = memento.getInteger(TAG_VERTICAL_SCROLL);
if (vScroll != null) {
bar.setSelection(vScroll.intValue());
}
@@ -204,26 +215,26 @@
/**
* Attaches a contextmenu listener to the table
*/
- public void initContextMenu(IMenuListener menuListener, String popupId, IWorkbenchPartSite viewSite) {
- MenuManager menuMgr= new MenuManager();
+ public void initContextMenu(IMenuListener menuListener, String popupId,
+ IWorkbenchPartSite viewSite) {
+ MenuManager menuMgr = new MenuManager();
menuMgr.setRemoveAllWhenShown(true);
menuMgr.addMenuListener(menuListener);
- Menu menu= menuMgr.createContextMenu(getTable());
+ Menu menu = menuMgr.createContextMenu(getTable());
getTable().setMenu(menu);
viewSite.registerContextMenu(popupId, menuMgr, this);
}
-
/**
- * Fills up the context menu with items for the method viewer
- * Should be called by the creator of the context menu
+ * Fills up the context menu with items for the method viewer Should be
+ * called by the creator of the context menu
*/
public void contributeToContextMenu(IMenuManager menu) {
}
/**
- * Fills up the tool bar with items for the method viewer
- * Should be called by the creator of the tool bar
+ * Fills up the tool bar with items for the method viewer Should be called
+ * by the creator of the tool bar
*/
public void contributeToToolBar(ToolBarManager tbm) {
tbm.add(fShowInheritedMembersAction);
@@ -235,26 +246,30 @@
public void dispose() {
if (fMemberFilterActionGroup != null) {
fMemberFilterActionGroup.dispose();
- fMemberFilterActionGroup= null;
+ fMemberFilterActionGroup = null;
}
}
@Override
- protected void handleInvalidSelection(ISelection invalidSelection, ISelection newSelection) {
- // on change of input, try to keep selected methods stable by selecting a method with the same
+ protected void handleInvalidSelection(ISelection invalidSelection,
+ ISelection newSelection) {
+ // on change of input, try to keep selected methods stable by selecting
+ // a method with the same
// signature: See #5466
- List oldSelections= SelectionUtil.toList(invalidSelection);
- List newSelections= SelectionUtil.toList(newSelection);
+ List oldSelections = SelectionUtil.toList(invalidSelection);
+ List newSelections = SelectionUtil.toList(newSelection);
if (!oldSelections.isEmpty()) {
- ArrayList newSelectionElements= new ArrayList(newSelections);
+ ArrayList newSelectionElements = new ArrayList(newSelections);
try {
- Object[] currElements= getFilteredChildren(getInput());
- for (int i= 0; i < oldSelections.size(); i++) {
- Object curr= oldSelections.get(i);
- if (curr instanceof IMethod && !newSelections.contains(curr)) {
- IMethod method= (IMethod) curr;
+ Object[] currElements = getFilteredChildren(getInput());
+ for (int i = 0; i < oldSelections.size(); i++) {
+ Object curr = oldSelections.get(i);
+ if (curr instanceof IMethod
+ && !newSelections.contains(curr)) {
+ IMethod method = (IMethod) curr;
if (method.exists()) {
- IMethod similar= findSimilarMethod(method, currElements);
+ IMethod similar = findSimilarMethod(method,
+ currElements);
if (similar != null) {
newSelectionElements.add(similar);
}
@@ -262,9 +277,10 @@
}
}
if (!newSelectionElements.isEmpty()) {
- newSelection= new StructuredSelection(newSelectionElements);
+ newSelection = new StructuredSelection(
+ newSelectionElements);
} else if (currElements.length > 0) {
- newSelection= new StructuredSelection(currElements[0]);
+ newSelection = new StructuredSelection(currElements[0]);
}
} catch (ModelException e) {
DLTKUIPlugin.log(e);
@@ -274,21 +290,21 @@
updateSelection(newSelection);
}
- private IMethod findSimilarMethod(IMethod meth, Object[] elements) throws ModelException {
-// String name= meth.getElementName();
-// String[] paramTypes= meth.getParameterTypes();
-// boolean isConstructor= meth.isConstructor();
-//
-// for (int i= 0; i < elements.length; i++) {
-// Object curr= elements[i];
-// if (curr instanceof IMethod &&
-// JavaModelUtil.isSameMethodSignature(name, paramTypes, isConstructor, (IMethod) curr)) {
-// return (IMethod) curr;
-// }
-// }
+ private IMethod findSimilarMethod(IMethod meth, Object[] elements)
+ throws ModelException {
+ // String name= meth.getElementName();
+ // String[] paramTypes= meth.getParameterTypes();
+ // boolean isConstructor= meth.isConstructor();
+ //
+ // for (int i= 0; i < elements.length; i++) {
+ // Object curr= elements[i];
+ // if (curr instanceof IMethod &&
+ // JavaModelUtil.isSameMethodSignature(name, paramTypes, isConstructor,
+ // (IMethod) curr)) {
+ // return (IMethod) curr;
+ // }
+ // }
return null;
}
-
-
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/TypeHierarchyViewer.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/TypeHierarchyViewer.java
index 4b889b5..ca09183 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/TypeHierarchyViewer.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/TypeHierarchyViewer.java
@@ -39,12 +39,12 @@
fLabelProvider = new HierarchyLabelProvider(lifeCycle, store);
- setLabelProvider(new StyledDecoratingModelLabelProvider(fLabelProvider,
- true));
+ setLabelProvider(
+ new StyledDecoratingModelLabelProvider(fLabelProvider, true));
setUseHashlookup(true);
setContentProvider(contentProvider);
- setSorter(new HierarchyViewerSorter(lifeCycle));
+ setComparator(new HierarchyViewerSorter(lifeCycle));
fOpen = new HierarchyOpenAction(part.getSite());
addOpenListener(event -> fOpen.run());
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/BPListElementSorter.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/BPListElementSorter.java
index 567a110..c1693cf 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/BPListElementSorter.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/BPListElementSorter.java
@@ -14,24 +14,24 @@
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
-public class BPListElementSorter extends ViewerSorter {
+public class BPListElementSorter extends ViewerComparator {
- private static final int SOURCE= 0;
- private static final int PROJECT= 1;
- private static final int LIBRARY= 2;
- private static final int CONTAINER= 3;
+ private static final int SOURCE = 0;
+ private static final int PROJECT = 1;
+ private static final int LIBRARY = 2;
+ private static final int CONTAINER = 3;
- private static final int ATTRIBUTE= 5;
- private static final int CONTAINER_ENTRY= 6;
+ private static final int ATTRIBUTE = 5;
+ private static final int CONTAINER_ENTRY = 6;
- private static final int OTHER= 7;
+ private static final int OTHER = 7;
@Override
public int category(Object obj) {
if (obj instanceof BPListElement) {
- BPListElement element= (BPListElement) obj;
+ BPListElement element = (BPListElement) obj;
if (element.getParentContainer() != null) {
return CONTAINER_ENTRY;
}
@@ -56,27 +56,27 @@
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
- int cat1 = category(e1);
- int cat2 = category(e2);
+ int cat1 = category(e1);
+ int cat2 = category(e2);
- if (cat1 != cat2)
- return cat1 - cat2;
+ if (cat1 != cat2)
+ return cat1 - cat2;
- if (cat1 == ATTRIBUTE || cat1 == CONTAINER_ENTRY) {
- return 0; // do not sort attributes or container entries
- }
+ if (cat1 == ATTRIBUTE || cat1 == CONTAINER_ENTRY) {
+ return 0; // do not sort attributes or container entries
+ }
if (viewer instanceof ContentViewer) {
- IBaseLabelProvider prov = ((ContentViewer) viewer).getLabelProvider();
- if (prov instanceof ILabelProvider) {
- ILabelProvider lprov = (ILabelProvider) prov;
- String name1 = lprov.getText(e1);
- String name2 = lprov.getText(e2);
- return getComparator().compare(name1, name2);
- }
+ IBaseLabelProvider prov = ((ContentViewer) viewer)
+ .getLabelProvider();
+ if (prov instanceof ILabelProvider) {
+ ILabelProvider lprov = (ILabelProvider) prov;
+ String name1 = lprov.getText(e1);
+ String name2 = lprov.getText(e2);
+ return getComparator().compare(name1, name2);
+ }
}
return 0;
}
-
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/BuildpathContainerSelectionPage.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/BuildpathContainerSelectionPage.java
index a569b45..d287893 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/BuildpathContainerSelectionPage.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/BuildpathContainerSelectionPage.java
@@ -21,19 +21,17 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
-
/**
*/
public class BuildpathContainerSelectionPage extends WizardPage {
- private static final String DIALOGSTORE_SECTION= "BuildpathContainerSelectionPage"; //$NON-NLS-1$
- private static final String DIALOGSTORE_CONTAINER_IDX= "index"; //$NON-NLS-1$
-
+ private static final String DIALOGSTORE_SECTION = "BuildpathContainerSelectionPage"; //$NON-NLS-1$
+ private static final String DIALOGSTORE_CONTAINER_IDX = "index"; //$NON-NLS-1$
private static class BuildpathContainerLabelProvider extends LabelProvider {
@Override
@@ -42,7 +40,7 @@
}
}
- private static class BuildpathContainerSorter extends ViewerSorter {
+ private static class BuildpathContainerSorter extends ViewerComparator {
}
private ListViewer fListViewer;
@@ -51,20 +49,24 @@
/**
* Constructor for BuildpathContainerWizardPage.
+ *
* @param containerPages
*/
- protected BuildpathContainerSelectionPage(BuildpathContainerDescriptor[] containerPages) {
+ protected BuildpathContainerSelectionPage(
+ BuildpathContainerDescriptor[] containerPages) {
super("BuildpathContainerWizardPage"); //$NON-NLS-1$
setTitle(NewWizardMessages.BuildpathContainerSelectionPage_title);
- setDescription(NewWizardMessages.BuildpathContainerSelectionPage_description);
+ setDescription(
+ NewWizardMessages.BuildpathContainerSelectionPage_description);
setImageDescriptor(DLTKPluginImages.DESC_WIZBAN_ADD_LIBRARY);
- fContainers= containerPages;
+ fContainers = containerPages;
- IDialogSettings settings= DLTKUIPlugin.getDefault().getDialogSettings();
- fDialogSettings= settings.getSection(DIALOGSTORE_SECTION);
+ IDialogSettings settings = DLTKUIPlugin.getDefault()
+ .getDialogSettings();
+ fDialogSettings = settings.getSection(DIALOGSTORE_SECTION);
if (fDialogSettings == null) {
- fDialogSettings= settings.addNewSection(DIALOGSTORE_SECTION);
+ fDialogSettings = settings.addNewSection(DIALOGSTORE_SECTION);
fDialogSettings.put(DIALOGSTORE_CONTAINER_IDX, 0);
}
validatePage();
@@ -72,27 +74,29 @@
@Override
public void createControl(Composite parent) {
- fListViewer= new ListViewer(parent, SWT.SINGLE | SWT.BORDER);
+ fListViewer = new ListViewer(parent, SWT.SINGLE | SWT.BORDER);
fListViewer.setLabelProvider(new BuildpathContainerLabelProvider());
fListViewer.setContentProvider(new ArrayContentProvider());
- fListViewer.setSorter(new BuildpathContainerSorter());
+ fListViewer.setComparator(new BuildpathContainerSorter());
fListViewer.setInput(Arrays.asList(fContainers));
fListViewer.addSelectionChangedListener(event -> validatePage());
fListViewer.addDoubleClickListener(event -> doDoubleClick());
- int selectionIndex= fDialogSettings.getInt(DIALOGSTORE_CONTAINER_IDX);
+ int selectionIndex = fDialogSettings.getInt(DIALOGSTORE_CONTAINER_IDX);
if (selectionIndex >= fContainers.length) {
- selectionIndex= 0;
+ selectionIndex = 0;
}
fListViewer.getList().select(selectionIndex);
validatePage();
setControl(fListViewer.getList());
Dialog.applyDialogFont(fListViewer.getList());
- if(DLTKCore.DEBUG) {
- System.err.println("BuildpathContainerSelectionPage: add help support here"); //$NON-NLS-1$
+ if (DLTKCore.DEBUG) {
+ System.err.println(
+ "BuildpathContainerSelectionPage: add help support here"); //$NON-NLS-1$
}
- //PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDLTKHelpContextIds.BP_SELECT_CLASSPATH_CONTAINER);
+ // PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,
+ // IDLTKHelpContextIds.BP_SELECT_CLASSPATH_CONTAINER);
}
/**
@@ -102,11 +106,11 @@
setPageComplete(getSelected() != null);
}
-
public BuildpathContainerDescriptor getSelected() {
if (fListViewer != null) {
- ISelection selection= fListViewer.getSelection();
- return (BuildpathContainerDescriptor) SelectionUtil.getSingleElement(selection);
+ ISelection selection = fListViewer.getSelection();
+ return (BuildpathContainerDescriptor) SelectionUtil
+ .getSingleElement(selection);
}
return null;
}
@@ -123,13 +127,15 @@
@Override
public boolean canFlipToNextPage() {
- return isPageComplete(); // avoid the getNextPage call to prevent potential plugin load
+ return isPageComplete(); // avoid the getNextPage call to prevent
+ // potential plugin load
}
@Override
public void setVisible(boolean visible) {
if (!visible && fListViewer != null) {
- fDialogSettings.put(DIALOGSTORE_CONTAINER_IDX, fListViewer.getList().getSelectionIndex());
+ fDialogSettings.put(DIALOGSTORE_CONTAINER_IDX,
+ fListViewer.getList().getSelectionIndex());
}
super.setVisible(visible);
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/ExclusionInclusionDialog.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/ExclusionInclusionDialog.java
index 3914feb..66cb312 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/ExclusionInclusionDialog.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/ExclusionInclusionDialog.java
@@ -32,7 +32,7 @@
import org.eclipse.jface.dialogs.StatusDialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -42,7 +42,6 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
-
public class ExclusionInclusionDialog extends StatusDialog {
private static class ExclusionInclusionLabelProvider extends LabelProvider {
@@ -50,8 +49,9 @@
private Image fElementImage;
public ExclusionInclusionLabelProvider(ImageDescriptor descriptor) {
- ImageDescriptorRegistry registry= DLTKUIPlugin.getImageDescriptorRegistry();
- fElementImage= registry.get(descriptor);
+ ImageDescriptorRegistry registry = DLTKUIPlugin
+ .getImageDescriptorRegistry();
+ fElementImage = registry.get(descriptor);
}
@Override
@@ -73,107 +73,116 @@
private IContainer fCurrSourceFolder;
- private static final int IDX_ADD= 0;
- private static final int IDX_ADD_MULTIPLE= 1;
- private static final int IDX_EDIT= 2;
- private static final int IDX_REMOVE= 4;
+ private static final int IDX_ADD = 0;
+ private static final int IDX_ADD_MULTIPLE = 1;
+ private static final int IDX_EDIT = 2;
+ private static final int IDX_REMOVE = 4;
-
- public ExclusionInclusionDialog(Shell parent, BPListElement entryToEdit, boolean focusOnExcluded) {
+ public ExclusionInclusionDialog(Shell parent, BPListElement entryToEdit,
+ boolean focusOnExcluded) {
super(parent);
setShellStyle(getShellStyle() | SWT.RESIZE);
- fCurrElement= entryToEdit;
+ fCurrElement = entryToEdit;
setTitle(NewWizardMessages.ExclusionInclusionDialog_title);
- fCurrProject= entryToEdit.getScriptProject().getProject();
- IWorkspaceRoot root= fCurrProject.getWorkspace().getRoot();
- IResource res= root.findMember(entryToEdit.getPath());
+ fCurrProject = entryToEdit.getScriptProject().getProject();
+ IWorkspaceRoot root = fCurrProject.getWorkspace().getRoot();
+ IResource res = root.findMember(entryToEdit.getPath());
if (res instanceof IContainer) {
- fCurrSourceFolder= (IContainer) res;
+ fCurrSourceFolder = (IContainer) res;
}
- String excLabel= NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_label;
- ImageDescriptor excDescriptor= DLTKPluginImages.DESC_OBJS_EXCLUSION_FILTER_ATTRIB;
- String[] excButtonLabels= new String[] {
+ String excLabel = NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_label;
+ ImageDescriptor excDescriptor = DLTKPluginImages.DESC_OBJS_EXCLUSION_FILTER_ATTRIB;
+ String[] excButtonLabels = new String[] {
NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_add,
NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_add_multiple,
NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_edit,
null,
- NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_remove
- };
+ NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_remove };
-
- String incLabel= NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_label;
- ImageDescriptor incDescriptor= DLTKPluginImages.DESC_OBJS_INCLUSION_FILTER_ATTRIB;
- String[] incButtonLabels= new String[] {
+ String incLabel = NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_label;
+ ImageDescriptor incDescriptor = DLTKPluginImages.DESC_OBJS_INCLUSION_FILTER_ATTRIB;
+ String[] incButtonLabels = new String[] {
NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_add,
NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_add_multiple,
NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_edit,
null,
- NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_remove
- };
+ NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_remove };
- fExclusionPatternList= createListContents(entryToEdit, BPListElement.EXCLUSION, excLabel, excDescriptor, excButtonLabels);
- fInclusionPatternList= createListContents(entryToEdit, BPListElement.INCLUSION, incLabel, incDescriptor, incButtonLabels);
+ fExclusionPatternList = createListContents(entryToEdit,
+ BPListElement.EXCLUSION, excLabel, excDescriptor,
+ excButtonLabels);
+ fInclusionPatternList = createListContents(entryToEdit,
+ BPListElement.INCLUSION, incLabel, incDescriptor,
+ incButtonLabels);
if (focusOnExcluded) {
- fExclusionPatternList.postSetFocusOnDialogField(parent.getDisplay());
+ fExclusionPatternList
+ .postSetFocusOnDialogField(parent.getDisplay());
} else {
- fInclusionPatternList.postSetFocusOnDialogField(parent.getDisplay());
+ fInclusionPatternList
+ .postSetFocusOnDialogField(parent.getDisplay());
}
}
+ private ListDialogField createListContents(BPListElement entryToEdit,
+ String key, String label, ImageDescriptor descriptor,
+ String[] buttonLabels) {
+ ExclusionPatternAdapter adapter = new ExclusionPatternAdapter();
- private ListDialogField createListContents(BPListElement entryToEdit, String key, String label, ImageDescriptor descriptor, String[] buttonLabels) {
- ExclusionPatternAdapter adapter= new ExclusionPatternAdapter();
-
- ListDialogField patternList= new ListDialogField(adapter, buttonLabels, new ExclusionInclusionLabelProvider(descriptor));
+ ListDialogField patternList = new ListDialogField(adapter, buttonLabels,
+ new ExclusionInclusionLabelProvider(descriptor));
patternList.setDialogFieldListener(adapter);
patternList.setLabelText(label);
patternList.setRemoveButtonIndex(IDX_REMOVE);
patternList.enableButton(IDX_EDIT, false);
- IPath[] pattern= (IPath[]) entryToEdit.getAttribute(key);
+ IPath[] pattern = (IPath[]) entryToEdit.getAttribute(key);
- ArrayList elements= new ArrayList(pattern.length);
- for (int i= 0; i < pattern.length; i++) {
+ ArrayList elements = new ArrayList(pattern.length);
+ for (int i = 0; i < pattern.length; i++) {
elements.add(pattern[i].toString());
}
patternList.setElements(elements);
patternList.selectFirstElement();
patternList.enableButton(IDX_ADD_MULTIPLE, fCurrSourceFolder != null);
- patternList.setViewerSorter(new ViewerSorter());
+ patternList.setViewerComparator(new ViewerComparator());
return patternList;
}
-
@Override
protected Control createDialogArea(Composite parent) {
- Composite composite= (Composite) super.createDialogArea(parent);
+ Composite composite = (Composite) super.createDialogArea(parent);
- Composite inner= new Composite(composite, SWT.NONE);
+ Composite inner = new Composite(composite, SWT.NONE);
inner.setFont(parent.getFont());
- GridLayout layout= new GridLayout();
- layout.marginHeight= 0;
- layout.marginWidth= 0;
- layout.numColumns= 2;
+ GridLayout layout = new GridLayout();
+ layout.marginHeight = 0;
+ layout.marginWidth = 0;
+ layout.numColumns = 2;
inner.setLayout(layout);
inner.setLayoutData(new GridData(GridData.FILL_BOTH));
- DialogField labelField= new DialogField();
- String name= fCurrElement.getPath().makeRelative().toString();
- labelField.setLabelText(Messages.format(NewWizardMessages.ExclusionInclusionDialog_description, name));
+ DialogField labelField = new DialogField();
+ String name = fCurrElement.getPath().makeRelative().toString();
+ labelField.setLabelText(Messages.format(
+ NewWizardMessages.ExclusionInclusionDialog_description, name));
labelField.doFillIntoGrid(inner, 2);
fInclusionPatternList.doFillIntoGrid(inner, 3);
- LayoutUtil.setHorizontalSpan(fInclusionPatternList.getLabelControl(null), 2);
- LayoutUtil.setHorizontalGrabbing(fInclusionPatternList.getListControl(null));
+ LayoutUtil.setHorizontalSpan(
+ fInclusionPatternList.getLabelControl(null), 2);
+ LayoutUtil.setHorizontalGrabbing(
+ fInclusionPatternList.getListControl(null));
fExclusionPatternList.doFillIntoGrid(inner, 3);
- LayoutUtil.setHorizontalSpan(fExclusionPatternList.getLabelControl(null), 2);
- LayoutUtil.setHorizontalGrabbing(fExclusionPatternList.getListControl(null));
+ LayoutUtil.setHorizontalSpan(
+ fExclusionPatternList.getLabelControl(null), 2);
+ LayoutUtil.setHorizontalGrabbing(
+ fExclusionPatternList.getListControl(null));
applyDialogFont(composite);
return composite;
@@ -194,7 +203,7 @@
}
protected void doSelectionChanged(ListDialogField field) {
- List selected= field.getSelectedElements();
+ List selected = field.getSelectedElements();
field.enableButton(IDX_EDIT, canEdit(selected));
}
@@ -203,13 +212,14 @@
}
private void editEntry(ListDialogField field) {
- List selElements= field.getSelectedElements();
+ List selElements = field.getSelectedElements();
if (selElements.size() != 1) {
return;
}
- List existing= field.getElements();
- String entry= (String) selElements.get(0);
- ExclusionInclusionEntryDialog dialog= new ExclusionInclusionEntryDialog(getShell(), isExclusion(field), entry, existing, fCurrElement);
+ List existing = field.getElements();
+ String entry = (String) selElements.get(0);
+ ExclusionInclusionEntryDialog dialog = new ExclusionInclusionEntryDialog(
+ getShell(), isExclusion(field), entry, existing, fCurrElement);
if (dialog.open() == Window.OK) {
field.replaceElement(entry, dialog.getExclusionPattern());
}
@@ -219,20 +229,19 @@
return field == fExclusionPatternList;
}
-
private void addEntry(ListDialogField field) {
- List existing= field.getElements();
- ExclusionInclusionEntryDialog dialog= new ExclusionInclusionEntryDialog(getShell(), isExclusion(field), null, existing, fCurrElement);
+ List existing = field.getElements();
+ ExclusionInclusionEntryDialog dialog = new ExclusionInclusionEntryDialog(
+ getShell(), isExclusion(field), null, existing, fCurrElement);
if (dialog.open() == Window.OK) {
field.addElement(dialog.getExclusionPattern());
}
}
-
-
// -------- ExclusionPatternAdapter --------
- private class ExclusionPatternAdapter implements IListAdapter, IDialogFieldListener {
+ private class ExclusionPatternAdapter
+ implements IListAdapter, IDialogFieldListener {
@Override
public void customButtonPressed(ListDialogField field, int index) {
doCustomButtonPressed(field, index);
@@ -260,13 +269,12 @@
protected void checkIfPatternValid() {
}
-
private IPath[] getPattern(ListDialogField field) {
- Object[] arr= field.getElements().toArray();
+ Object[] arr = field.getElements().toArray();
Arrays.sort(arr);
- IPath[] res= new IPath[arr.length];
- for (int i= 0; i < res.length; i++) {
- res[i]= new Path((String) arr[i]);
+ IPath[] res = new IPath[arr.length];
+ for (int i = 0; i < res.length; i++) {
+ res[i] = new Path((String) arr[i]);
}
return res;
}
@@ -283,24 +291,27 @@
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
if (DLTKCore.DEBUG) {
- System.err.println("ExclusionInclusionDialog add help support here"); //$NON-NLS-1$
+ System.err
+ .println("ExclusionInclusionDialog add help support here"); //$NON-NLS-1$
}
- //PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IDLTKHelpContextIds.EXCLUSION_PATTERN_DIALOG);
+ // PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell,
+ // IDLTKHelpContextIds.EXCLUSION_PATTERN_DIALOG);
}
private void addMultipleEntries(ListDialogField field) {
String title, message;
if (isExclusion(field)) {
- title= NewWizardMessages.ExclusionInclusionDialog_ChooseExclusionPattern_title;
- message= NewWizardMessages.ExclusionInclusionDialog_ChooseExclusionPattern_description;
+ title = NewWizardMessages.ExclusionInclusionDialog_ChooseExclusionPattern_title;
+ message = NewWizardMessages.ExclusionInclusionDialog_ChooseExclusionPattern_description;
} else {
- title= NewWizardMessages.ExclusionInclusionDialog_ChooseInclusionPattern_title;
- message= NewWizardMessages.ExclusionInclusionDialog_ChooseInclusionPattern_description;
+ title = NewWizardMessages.ExclusionInclusionDialog_ChooseInclusionPattern_title;
+ message = NewWizardMessages.ExclusionInclusionDialog_ChooseInclusionPattern_description;
}
- IPath[] res= ExclusionInclusionEntryDialog.chooseExclusionPattern(getShell(), fCurrSourceFolder, title, message, null, true);
+ IPath[] res = ExclusionInclusionEntryDialog.chooseExclusionPattern(
+ getShell(), fCurrSourceFolder, title, message, null, true);
if (res != null) {
- for (int i= 0; i < res.length; i++) {
+ for (int i = 0; i < res.length; i++) {
field.addElement(res[i].toString());
}
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/LibrariesWorkbookPage.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/LibrariesWorkbookPage.java
index 7f88132..474b921 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/LibrariesWorkbookPage.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/LibrariesWorkbookPage.java
@@ -114,18 +114,18 @@
new BPListLabelProvider());
fLibrariesList.setDialogFieldListener(adapter);
if (this.fWithZip) {
- fLibrariesList
- .setLabelText(NewWizardMessages.LibrariesWorkbookPage_libraries_label);
+ fLibrariesList.setLabelText(
+ NewWizardMessages.LibrariesWorkbookPage_libraries_label);
} else {
- fLibrariesList
- .setLabelText(NewWizardMessages.LibrariesWorkbookPage_libraries_without_label);
+ fLibrariesList.setLabelText(
+ NewWizardMessages.LibrariesWorkbookPage_libraries_without_label);
}
fLibrariesList.enableButton(IDX_REMOVE + IDX_ADD, false);
fLibrariesList.enableButton(IDX_EDIT + IDX_ADD, false);
if (fWithZip) {
fLibrariesList.enableButton(IDX_REPLACE + IDX_ADD, false);
}
- fLibrariesList.setViewerSorter(new BPListElementSorter());
+ fLibrariesList.setViewerComparator(new BPListElementSorter());
}
@Override
@@ -167,7 +167,7 @@
LayoutUtil.setHorizontalGrabbing(fLibrariesList.getTreeControl(null));
int buttonBarWidth = converter.convertWidthInCharsToPixels(24);
fLibrariesList.setButtonsMinWidth(buttonBarWidth);
- fLibrariesList.getTreeViewer().setSorter(new BPListElementSorter());
+ fLibrariesList.getTreeViewer().setComparator(new BPListElementSorter());
fSWTControl = composite;
return composite;
}
@@ -179,8 +179,8 @@
return DLTKUIPlugin.getActiveWorkbenchShell();
}
- private class LibrariesAdapter implements IDialogFieldListener,
- ITreeListAdapter {
+ private class LibrariesAdapter
+ implements IDialogFieldListener, ITreeListAdapter {
private final Object[] EMPTY_ARR = new Object[0];
// -------- IListAdapter --------
@@ -363,7 +363,8 @@
}
attrib.getParent().setAttribute(key, value);
selElements.remove(i);
- if (attrib.getParent().getParentContainer() instanceof BPListElement) { // inside
+ if (attrib.getParent()
+ .getParentContainer() instanceof BPListElement) { // inside
// a
// container:
// apply
@@ -389,17 +390,16 @@
} else {
fLibrariesList.removeElements(selElements);
}
- for (Iterator iter = containerEntriesToUpdate.entrySet().iterator(); iter
- .hasNext();) {
+ for (Iterator iter = containerEntriesToUpdate.entrySet()
+ .iterator(); iter.hasNext();) {
Map.Entry entry = (Entry) iter.next();
BPListElement curr = (BPListElement) entry.getKey();
HashSet attribs = (HashSet) entry.getValue();
String[] changedAttributes = (String[]) attribs
.toArray(new String[attribs.size()]);
IBuildpathEntry changedEntry = curr.getBuildpathEntry();
- updateContainerEntry(changedEntry, changedAttributes,
- fCurrJProject, ((BPListElement) curr.getParentContainer())
- .getPath());
+ updateContainerEntry(changedEntry, changedAttributes, fCurrJProject,
+ ((BPListElement) curr.getParentContainer()).getPath());
}
}
@@ -456,8 +456,8 @@
selElement, fCurrJProject, fPageContainer != null);
int res = dialog.open();
if (res == Window.OK || res == AccessRulesDialog.SWITCH_PAGE) {
- selElement.setAttribute(BPListElement.ACCESSRULES, dialog
- .getAccessRules());
+ selElement.setAttribute(BPListElement.ACCESSRULES,
+ dialog.getAccessRules());
String[] changedAttributes = { BPListElement.ACCESSRULES };
attributeUpdated(selElement, changedAttributes);
fLibrariesList.refresh(elem);
@@ -493,8 +493,8 @@
// apply changes right
// away
IBuildpathEntry updatedEntry = selElement.getBuildpathEntry();
- updateContainerEntry(updatedEntry, changedAttributes,
- fCurrJProject, ((BPListElement) parentContainer).getPath());
+ updateContainerEntry(updatedEntry, changedAttributes, fCurrJProject,
+ ((BPListElement) parentContainer).getPath());
}
}
@@ -526,9 +526,10 @@
IEnvironment environment = getEnvironment();
IResource resource = elem.getResource();
if (resource == null) {
- if (Util.isArchiveFileName(DLTKLanguageManager
- .getLanguageToolkit(elem.getScriptProject()), elem
- .getPath().toOSString())) {
+ if (Util.isArchiveFileName(
+ DLTKLanguageManager
+ .getLanguageToolkit(elem.getScriptProject()),
+ elem.getPath().toOSString())) {
res = openExtZipFileDialog(elem, environment);
} else {
res = opensExtSourceFolderDialog(elem, environment);
@@ -578,8 +579,8 @@
Object elem = selElements.get(0);
if (elem instanceof BPListElement) {
BPListElement curr = (BPListElement) elem;
- return !(curr.getResource() instanceof IFolder || curr
- .isExternalFolder())
+ return !(curr.getResource() instanceof IFolder
+ || curr.isExternalFolder())
&& curr.getParentContainer() == null;
}
if (elem instanceof BPListElementAttribute) {
@@ -622,17 +623,16 @@
}
private BPListElement[] openNewClassFolderDialog(BPListElement existing) {
- String title = (existing == null) ? NewWizardMessages.LibrariesWorkbookPage_NewClassFolderDialog_new_title
+ String title = (existing == null)
+ ? NewWizardMessages.LibrariesWorkbookPage_NewClassFolderDialog_new_title
: NewWizardMessages.LibrariesWorkbookPage_NewClassFolderDialog_edit_title;
IProject currProject = fCurrJProject.getProject();
NewContainerDialog dialog = new NewContainerDialog(getShell(), title,
currProject, getUsedContainers(existing), existing);
IPath projpath = currProject.getFullPath();
- dialog
- .setMessage(Messages
- .format(
- NewWizardMessages.LibrariesWorkbookPage_NewClassFolderDialog_description,
- projpath.toString()));
+ dialog.setMessage(Messages.format(
+ NewWizardMessages.LibrariesWorkbookPage_NewClassFolderDialog_description,
+ projpath.toString()));
if (dialog.open() == Window.OK) {
IFolder folder = dialog.getFolder();
return new BPListElement[] { newBPLibraryElement(folder, false) };
@@ -644,9 +644,9 @@
IEnvironment environment) {
if (existing == null) {
IPath[] selected = BuildpathDialogAccess
- .chooseExtSourceFolderEntries(getShell(), fCurrJProject
- .getPath(), getUsedContainers(existing),
- environment);
+ .chooseExtSourceFolderEntries(getShell(),
+ fCurrJProject.getPath(),
+ getUsedContainers(existing), environment);
if (selected != null) {
// IWorkspaceRoot root =
// fCurrJProject.getProject().getWorkspace().getRoot();
@@ -714,8 +714,8 @@
if (configured != null) {
IResource resource = root.findMember(configured);
if (resource instanceof IFile) {
- return new BPListElement[] { newBPLibraryElement(resource,
- false) };
+ return new BPListElement[] {
+ newBPLibraryElement(resource, false) };
}
}
}
@@ -776,8 +776,8 @@
}
} else {
IPath configured = BuildpathDialogAccess
- .configureExternalArchiveEntry(getShell(), existing
- .getPath());
+ .configureExternalArchiveEntry(getShell(),
+ existing.getPath());
if (configured != null) {
return new BPListElement[] { new BPListElement(fCurrJProject,
IBuildpathEntry.BPE_LIBRARY, configured, null, true) };
@@ -786,7 +786,8 @@
return null;
}
- private BPListElement[] openContainerSelectionDialog(BPListElement existing) {
+ private BPListElement[] openContainerSelectionDialog(
+ BPListElement existing) {
if (existing == null) {
IBuildpathEntry[] created = BuildpathDialogAccess
.chooseContainerEntries(getShell(), fCurrJProject,
@@ -795,15 +796,15 @@
BPListElement[] res = new BPListElement[created.length];
for (int i = 0; i < res.length; i++) {
res[i] = new BPListElement(fCurrJProject,
- IBuildpathEntry.BPE_CONTAINER,
- created[i].getPath(), null, false);
+ IBuildpathEntry.BPE_CONTAINER, created[i].getPath(),
+ null, false);
}
return res;
}
} else {
IBuildpathEntry created = BuildpathDialogAccess
- .configureContainerEntry(getShell(), existing
- .getBuildpathEntry(), fCurrJProject,
+ .configureContainerEntry(getShell(),
+ existing.getBuildpathEntry(), fCurrJProject,
getRawBuildpath());
if (created != null) {
BPListElement elem = BPListElement.createFromExisting(created,
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/ProjectsWorkbookPage.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/ProjectsWorkbookPage.java
index 4218ff5..f054c2f 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/ProjectsWorkbookPage.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/ProjectsWorkbookPage.java
@@ -75,13 +75,13 @@
fProjectsList = new TreeListDialogField(adapter, buttonLabels,
new BPListLabelProvider());
fProjectsList.setDialogFieldListener(adapter);
- fProjectsList
- .setLabelText(NewWizardMessages.ProjectsWorkbookPage_projects_label);
+ fProjectsList.setLabelText(
+ NewWizardMessages.ProjectsWorkbookPage_projects_label);
fProjectsList.enableButton(IDX_REMOVE, false);
fProjectsList.enableButton(IDX_EDIT, false);
- fProjectsList.setViewerSorter(new BPListElementSorter());
+ fProjectsList.setViewerComparator(new BPListElementSorter());
}
@Override
@@ -179,8 +179,8 @@
return kind == IBuildpathEntry.BPE_PROJECT;
}
- private class ProjectsAdapter implements IDialogFieldListener,
- ITreeListAdapter {
+ private class ProjectsAdapter
+ implements IDialogFieldListener, ITreeListAdapter {
private final Object[] EMPTY_ARR = new Object[0];
@@ -364,12 +364,12 @@
}
private void showAccessRestrictionDialog(BPListElement selElement) {
- AccessRulesDialog dialog = new AccessRulesDialog(getShell(),
- selElement, fCurrJProject, fPageContainer != null);
+ AccessRulesDialog dialog = new AccessRulesDialog(getShell(), selElement,
+ fCurrJProject, fPageContainer != null);
int res = dialog.open();
if (res == Window.OK || res == AccessRulesDialog.SWITCH_PAGE) {
- selElement.setAttribute(BPListElement.ACCESSRULES, dialog
- .getAccessRules());
+ selElement.setAttribute(BPListElement.ACCESSRULES,
+ dialog.getAccessRules());
selElement.setAttribute(BPListElement.COMBINE_ACCESSRULES,
dialog.doCombineAccessRules());
fProjectsList.refresh();
@@ -405,30 +405,28 @@
final IScriptModel model = fCurrJProject.getModel();
final IDLTKLanguageToolkit toolkit = fCurrJProject
.getLanguageToolkit();
- selectable.addAll(Arrays.asList(toolkit != null ? model
- .getScriptProjects(toolkit.getNatureId()) : model
- .getScriptProjects()));
+ selectable.addAll(Arrays.asList(toolkit != null
+ ? model.getScriptProjects(toolkit.getNatureId())
+ : model.getScriptProjects()));
selectable.remove(fCurrJProject);
List elements = fProjectsList.getElements();
for (int i = 0; i < elements.size(); i++) {
BPListElement curr = (BPListElement) elements.get(0);
- IScriptProject proj = (IScriptProject) DLTKCore.create(curr
- .getResource());
+ IScriptProject proj = (IScriptProject) DLTKCore
+ .create(curr.getResource());
selectable.remove(proj);
}
Object[] selectArr = selectable.toArray();
new ModelElementSorter().sort(null, selectArr);
// IScriptProject project = elem.getScriptProject();
ScriptUILabelProvider labelProvider = new ScriptUILabelProvider();
- ListSelectionDialog dialog = new ListSelectionDialog(
- getShell(),
- Arrays.asList(selectArr),
- new ArrayContentProvider(),
+ ListSelectionDialog dialog = new ListSelectionDialog(getShell(),
+ Arrays.asList(selectArr), new ArrayContentProvider(),
labelProvider,
NewWizardMessages.ProjectsWorkbookPage_chooseProjects_message);
- dialog
- .setTitle(NewWizardMessages.ProjectsWorkbookPage_chooseProjects_title);
+ dialog.setTitle(
+ NewWizardMessages.ProjectsWorkbookPage_chooseProjects_title);
dialog.setHelpAvailable(false);
if (dialog.open() == Window.OK) {
Object[] result = dialog.getResult();
@@ -436,8 +434,8 @@
for (int i = 0; i < result.length; i++) {
IScriptProject curr = (IScriptProject) result[i];
cpElements[i] = new BPListElement(fCurrJProject,
- IBuildpathEntry.BPE_PROJECT, curr.getPath(), curr
- .getResource(), false);
+ IBuildpathEntry.BPE_PROJECT, curr.getPath(),
+ curr.getResource(), false);
}
return cpElements;
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/SetFilterWizardPage.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/SetFilterWizardPage.java
index ffae666..0e7920f 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/SetFilterWizardPage.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/SetFilterWizardPage.java
@@ -35,7 +35,7 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -44,10 +44,9 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
-
public class SetFilterWizardPage extends NewElementWizardPage {
- private static final String PAGE_NAME= "SetFilterWizardPage"; //$NON-NLS-1$
+ private static final String PAGE_NAME = "SetFilterWizardPage"; //$NON-NLS-1$
private ListDialogField fInclusionPatternList;
private ListDialogField fExclusionPatternList;
@@ -56,89 +55,96 @@
private IContainer fCurrSourceFolder;
- private static final int IDX_ADD= 0;
- private static final int IDX_ADD_MULTIPLE= 1;
- private static final int IDX_EDIT= 2;
- private static final int IDX_REMOVE= 4;
+ private static final int IDX_ADD = 0;
+ private static final int IDX_ADD_MULTIPLE = 1;
+ private static final int IDX_EDIT = 2;
+ private static final int IDX_REMOVE = 4;
private final ArrayList fExistingEntries;
- public SetFilterWizardPage(BPListElement entryToEdit, ArrayList existingEntries) {
+ public SetFilterWizardPage(BPListElement entryToEdit,
+ ArrayList existingEntries) {
super(PAGE_NAME);
- fExistingEntries= existingEntries;
+ fExistingEntries = existingEntries;
setTitle(NewWizardMessages.ExclusionInclusionDialog_title);
setDescription(NewWizardMessages.ExclusionInclusionDialog_description2);
- fCurrElement= entryToEdit;
- fCurrProject= entryToEdit.getScriptProject().getProject();
- IWorkspaceRoot root= fCurrProject.getWorkspace().getRoot();
- IResource res= root.findMember(entryToEdit.getPath());
+ fCurrElement = entryToEdit;
+ fCurrProject = entryToEdit.getScriptProject().getProject();
+ IWorkspaceRoot root = fCurrProject.getWorkspace().getRoot();
+ IResource res = root.findMember(entryToEdit.getPath());
if (res instanceof IContainer) {
- fCurrSourceFolder= (IContainer) res;
+ fCurrSourceFolder = (IContainer) res;
}
- String excLabel= NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_label;
- ImageDescriptor excDescriptor= DLTKPluginImages.DESC_OBJS_EXCLUSION_FILTER_ATTRIB;
- String[] excButtonLabels= new String[] {
+ String excLabel = NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_label;
+ ImageDescriptor excDescriptor = DLTKPluginImages.DESC_OBJS_EXCLUSION_FILTER_ATTRIB;
+ String[] excButtonLabels = new String[] {
NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_add,
NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_add_multiple,
NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_edit,
null,
- NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_remove
- };
+ NewWizardMessages.ExclusionInclusionDialog_exclusion_pattern_remove };
-
- String incLabel= NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_label;
- ImageDescriptor incDescriptor= DLTKPluginImages.DESC_OBJS_INCLUSION_FILTER_ATTRIB;
- String[] incButtonLabels= new String[] {
+ String incLabel = NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_label;
+ ImageDescriptor incDescriptor = DLTKPluginImages.DESC_OBJS_INCLUSION_FILTER_ATTRIB;
+ String[] incButtonLabels = new String[] {
NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_add,
NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_add_multiple,
NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_edit,
null,
- NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_remove
- };
+ NewWizardMessages.ExclusionInclusionDialog_inclusion_pattern_remove };
- fExclusionPatternList= createListContents(entryToEdit, BPListElement.EXCLUSION, excLabel, excDescriptor, excButtonLabels);
- fInclusionPatternList= createListContents(entryToEdit, BPListElement.INCLUSION, incLabel, incDescriptor, incButtonLabels);
+ fExclusionPatternList = createListContents(entryToEdit,
+ BPListElement.EXCLUSION, excLabel, excDescriptor,
+ excButtonLabels);
+ fInclusionPatternList = createListContents(entryToEdit,
+ BPListElement.INCLUSION, incLabel, incDescriptor,
+ incButtonLabels);
}
@Override
public void createControl(Composite parent) {
- Composite inner= new Composite(parent, SWT.NONE);
+ Composite inner = new Composite(parent, SWT.NONE);
inner.setFont(parent.getFont());
- GridLayout layout= new GridLayout();
- layout.marginHeight= 0;
- layout.marginWidth= 0;
- layout.numColumns= 2;
+ GridLayout layout = new GridLayout();
+ layout.marginHeight = 0;
+ layout.marginWidth = 0;
+ layout.numColumns = 2;
inner.setLayout(layout);
inner.setLayoutData(new GridData(GridData.FILL_BOTH));
fInclusionPatternList.doFillIntoGrid(inner, 3);
- LayoutUtil.setHorizontalSpan(fInclusionPatternList.getLabelControl(null), 2);
- LayoutUtil.setHorizontalGrabbing(fInclusionPatternList.getListControl(null));
+ LayoutUtil.setHorizontalSpan(
+ fInclusionPatternList.getLabelControl(null), 2);
+ LayoutUtil.setHorizontalGrabbing(
+ fInclusionPatternList.getListControl(null));
fExclusionPatternList.doFillIntoGrid(inner, 3);
- LayoutUtil.setHorizontalSpan(fExclusionPatternList.getLabelControl(null), 2);
- LayoutUtil.setHorizontalGrabbing(fExclusionPatternList.getListControl(null));
+ LayoutUtil.setHorizontalSpan(
+ fExclusionPatternList.getLabelControl(null), 2);
+ LayoutUtil.setHorizontalGrabbing(
+ fExclusionPatternList.getListControl(null));
setControl(inner);
Dialog.applyDialogFont(inner);
- if(DLTKCore.DEBUG) {
+ if (DLTKCore.DEBUG) {
System.err.println("SetFilterWizardOage add help support here"); //$NON-NLS-1$
}
- //PlatformUI.getWorkbench().getHelpSystem().setHelp(inner, IDLTKHelpContextIds.INCLUSION_EXCLUSION_WIZARD_PAGE);
+ // PlatformUI.getWorkbench().getHelpSystem().setHelp(inner,
+ // IDLTKHelpContextIds.INCLUSION_EXCLUSION_WIZARD_PAGE);
}
-
private static class ExclusionInclusionLabelProvider extends LabelProvider {
private Image fElementImage;
public ExclusionInclusionLabelProvider(ImageDescriptor descriptor) {
- ImageDescriptorRegistry registry= DLTKUIPlugin.getImageDescriptorRegistry();
- fElementImage= registry.get(descriptor);
+ ImageDescriptorRegistry registry = DLTKUIPlugin
+ .getImageDescriptorRegistry();
+ fElementImage = registry.get(descriptor);
}
@Override
@@ -153,27 +159,30 @@
}
- private ListDialogField createListContents(BPListElement entryToEdit, String key, String label, ImageDescriptor descriptor, String[] buttonLabels) {
- ExclusionPatternAdapter adapter= new ExclusionPatternAdapter();
+ private ListDialogField createListContents(BPListElement entryToEdit,
+ String key, String label, ImageDescriptor descriptor,
+ String[] buttonLabels) {
+ ExclusionPatternAdapter adapter = new ExclusionPatternAdapter();
- ListDialogField patternList= new ListDialogField(adapter, buttonLabels, new ExclusionInclusionLabelProvider(descriptor));
+ ListDialogField patternList = new ListDialogField(adapter, buttonLabels,
+ new ExclusionInclusionLabelProvider(descriptor));
patternList.setDialogFieldListener(adapter);
patternList.setLabelText(label);
patternList.enableButton(IDX_EDIT, false);
patternList.enableButton(IDX_REMOVE, false);
- IPath[] pattern= (IPath[]) entryToEdit.getAttribute(key);
+ IPath[] pattern = (IPath[]) entryToEdit.getAttribute(key);
- ArrayList elements= new ArrayList(pattern.length);
- for (int i= 0; i < pattern.length; i++) {
- String patternName= pattern[i].toString();
+ ArrayList elements = new ArrayList(pattern.length);
+ for (int i = 0; i < pattern.length; i++) {
+ String patternName = pattern[i].toString();
if (patternName.length() > 0)
elements.add(patternName);
}
patternList.setElements(elements);
patternList.selectFirstElement();
patternList.enableButton(IDX_ADD_MULTIPLE, fCurrSourceFolder != null);
- patternList.setViewerSorter(new ViewerSorter());
+ patternList.setViewerComparator(new ViewerComparator());
return patternList;
}
@@ -191,16 +200,19 @@
}
private void updateStatus() {
- fCurrElement.setAttribute(BPListElement.INCLUSION, getInclusionPattern());
- fCurrElement.setAttribute(BPListElement.EXCLUSION, getExclusionPattern());
- IModelStatus status= BuildpathEntry.validateBuildpath(fCurrElement.getScriptProject(),
+ fCurrElement.setAttribute(BPListElement.INCLUSION,
+ getInclusionPattern());
+ fCurrElement.setAttribute(BPListElement.EXCLUSION,
+ getExclusionPattern());
+ IModelStatus status = BuildpathEntry.validateBuildpath(
+ fCurrElement.getScriptProject(),
BPListElement.convertToBuildpathEntries(fExistingEntries));
if (!status.isOK()) {
- StatusInfo statusInfo= new StatusInfo();
+ StatusInfo statusInfo = new StatusInfo();
statusInfo.setError(status.getMessage());
updateStatus(statusInfo);
} else {
- StatusInfo statusInfo= new StatusInfo();
+ StatusInfo statusInfo = new StatusInfo();
statusInfo.setOK();
updateStatus(statusInfo);
}
@@ -212,7 +224,7 @@
}
protected void doSelectionChanged(ListDialogField field) {
- List selected= field.getSelectedElements();
+ List selected = field.getSelectedElements();
field.enableButton(IDX_EDIT, canEdit(selected));
field.enableButton(IDX_REMOVE, canDelete(selected));
}
@@ -226,13 +238,14 @@
}
private void editEntry(ListDialogField field) {
- List selElements= field.getSelectedElements();
+ List selElements = field.getSelectedElements();
if (selElements.size() != 1) {
return;
}
- List existing= field.getElements();
- String entry= (String) selElements.get(0);
- ExclusionInclusionEntryDialog dialog= new ExclusionInclusionEntryDialog(getShell(), isExclusion(field), entry, existing, fCurrElement);
+ List existing = field.getElements();
+ String entry = (String) selElements.get(0);
+ ExclusionInclusionEntryDialog dialog = new ExclusionInclusionEntryDialog(
+ getShell(), isExclusion(field), entry, existing, fCurrElement);
if (dialog.open() == Window.OK) {
field.replaceElement(entry, dialog.getExclusionPattern());
}
@@ -242,10 +255,10 @@
return field == fExclusionPatternList;
}
-
private void addEntry(ListDialogField field) {
- List existing= field.getElements();
- ExclusionInclusionEntryDialog dialog= new ExclusionInclusionEntryDialog(getShell(), isExclusion(field), null, existing, fCurrElement);
+ List existing = field.getElements();
+ ExclusionInclusionEntryDialog dialog = new ExclusionInclusionEntryDialog(
+ getShell(), isExclusion(field), null, existing, fCurrElement);
if (dialog.open() == Window.OK) {
field.addElement(dialog.getExclusionPattern());
}
@@ -253,7 +266,8 @@
// -------- ExclusionPatternAdapter --------
- private class ExclusionPatternAdapter implements IListAdapter, IDialogFieldListener {
+ private class ExclusionPatternAdapter
+ implements IListAdapter, IDialogFieldListener {
@Override
public void customButtonPressed(ListDialogField field, int index) {
@@ -282,13 +296,12 @@
protected void checkIfPatternValid() {
}
-
private IPath[] getPattern(ListDialogField field) {
- Object[] arr= field.getElements().toArray();
+ Object[] arr = field.getElements().toArray();
Arrays.sort(arr);
- IPath[] res= new IPath[arr.length];
- for (int i= 0; i < res.length; i++) {
- res[i]= new Path((String) arr[i]);
+ IPath[] res = new IPath[arr.length];
+ for (int i = 0; i < res.length; i++) {
+ res[i] = new Path((String) arr[i]);
}
return res;
}
@@ -305,22 +318,24 @@
if (DLTKCore.DEBUG) {
System.err.println("SetFilterWizardPage add help support here"); //$NON-NLS-1$
}
- //PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IDLTKHelpContextIds.EXCLUSION_PATTERN_DIALOG);
+ // PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell,
+ // IDLTKHelpContextIds.EXCLUSION_PATTERN_DIALOG);
}
private void addMultipleEntries(ListDialogField field) {
String title, message;
if (isExclusion(field)) {
- title= NewWizardMessages.ExclusionInclusionDialog_ChooseExclusionPattern_title;
- message= NewWizardMessages.ExclusionInclusionDialog_ChooseExclusionPattern_description;
+ title = NewWizardMessages.ExclusionInclusionDialog_ChooseExclusionPattern_title;
+ message = NewWizardMessages.ExclusionInclusionDialog_ChooseExclusionPattern_description;
} else {
- title= NewWizardMessages.ExclusionInclusionDialog_ChooseInclusionPattern_title;
- message= NewWizardMessages.ExclusionInclusionDialog_ChooseInclusionPattern_description;
+ title = NewWizardMessages.ExclusionInclusionDialog_ChooseInclusionPattern_title;
+ message = NewWizardMessages.ExclusionInclusionDialog_ChooseInclusionPattern_description;
}
- IPath[] res= ExclusionInclusionEntryDialog.chooseExclusionPattern(getShell(), fCurrSourceFolder, title, message, null, true);
+ IPath[] res = ExclusionInclusionEntryDialog.chooseExclusionPattern(
+ getShell(), fCurrSourceFolder, title, message, null, true);
if (res != null) {
- for (int i= 0; i < res.length; i++) {
+ for (int i = 0; i < res.length; i++) {
field.addElement(res[i].toString());
}
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/SourceContainerWorkbookPage.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/SourceContainerWorkbookPage.java
index 8461fc9..f127100 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/SourceContainerWorkbookPage.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/SourceContainerWorkbookPage.java
@@ -78,12 +78,12 @@
protected void finishWizard() {
List insertedElements = fWizard.getInsertedElements();
- refresh(insertedElements, fWizard.getRemovedElements(), fWizard
- .getModifiedElements());
+ refresh(insertedElements, fWizard.getRemovedElements(),
+ fWizard.getModifiedElements());
if (insertedElements.isEmpty()) {
- fFoldersList.postSetSelection(new StructuredSelection(
- fSelectedElements));
+ fFoldersList.postSetSelection(
+ new StructuredSelection(fSelectedElements));
}
}
@@ -95,9 +95,10 @@
BPListElement[] existing = existingElements
.toArray(new BPListElement[existingElements.size()]);
AddSourceFolderWizard wizard = new AddSourceFolderWizard(existing,
- element, false, newFolder, newFolder, newFolder ? BPListElement
- .isProjectSourceFolder(existing, element
- .getScriptProject()) : false, newFolder);
+ element, false, newFolder, newFolder,
+ newFolder ? BPListElement.isProjectSourceFolder(existing,
+ element.getScriptProject()) : false,
+ newFolder);
wizard.setDoFlushChange(false);
return wizard;
}
@@ -108,9 +109,10 @@
BPListElement[] existing = existingElements
.toArray(new BPListElement[existingElements.size()]);
AddSourceFolderWizard wizard = new AddSourceFolderWizard(existing,
- element, true, newFolder, newFolder, newFolder ? BPListElement
- .isProjectSourceFolder(existing, element
- .getScriptProject()) : false, newFolder);
+ element, true, newFolder, newFolder,
+ newFolder ? BPListElement.isProjectSourceFolder(existing,
+ element.getScriptProject()) : false,
+ newFolder);
wizard.setDoFlushChange(false);
return wizard;
}
@@ -175,10 +177,10 @@
fFoldersList = new TreeListDialogField(adapter, buttonLabels,
new BPListLabelProvider());
fFoldersList.setDialogFieldListener(adapter);
- fFoldersList
- .setLabelText(NewWizardMessages.SourceContainerWorkbookPage_folders_label);
+ fFoldersList.setLabelText(
+ NewWizardMessages.SourceContainerWorkbookPage_folders_label);
- fFoldersList.setViewerSorter(new BPListElementSorter());
+ fFoldersList.setViewerComparator(new BPListElementSorter());
fFoldersList.enableButton(getIDX_EDIT(), false);
}
@@ -261,8 +263,8 @@
return DLTKUIPlugin.getActiveWorkbenchShell();
}
- public class SourceContainerAdapter implements ITreeListAdapter,
- IDialogFieldListener {
+ public class SourceContainerAdapter
+ implements ITreeListAdapter, IDialogFieldListener {
private final Object[] EMPTY_ARR = new Object[0];
@@ -344,13 +346,14 @@
if (project.isAccessible() && hasFolders(project)) {
List existingElements = fFoldersList.getElements();
BPListElement[] existing = (BPListElement[]) existingElements
- .toArray(new BPListElement[existingElements.size()]);
+ .toArray(
+ new BPListElement[existingElements.size()]);
CreateMultipleSourceFoldersDialog dialog = new CreateMultipleSourceFoldersDialog(
fCurrJProject, existing, getShell());
if (dialog.open() == Window.OK) {
- refresh(dialog.getInsertedElements(), dialog
- .getRemovedElements(), dialog
- .getModifiedElements());
+ refresh(dialog.getInsertedElements(),
+ dialog.getRemovedElements(),
+ dialog.getModifiedElements());
}
} else {
BPListElement newElement = new BPListElement(fCurrJProject,
@@ -491,9 +494,9 @@
for (Iterator iter = selElements.iterator(); iter.hasNext();) {
BPListElement element = (BPListElement) iter.next();
if (element.getEntryKind() == IBuildpathEntry.BPE_SOURCE) {
- List list = BuildpathModifier.removeFilters(element
- .getPath(), fCurrJProject, fFoldersList
- .getElements());
+ List list = BuildpathModifier.removeFilters(
+ element.getPath(), fCurrJProject,
+ fFoldersList.getElements());
for (Iterator iterator = list.iterator(); iterator
.hasNext();) {
BPListElement modified = (BPListElement) iterator
@@ -635,8 +638,8 @@
fFoldersList.refresh(); // does enforce the order of the entries.
if (!insertedElements.isEmpty()) {
- fFoldersList.postSetSelection(new StructuredSelection(
- insertedElements));
+ fFoldersList.postSetSelection(
+ new StructuredSelection(insertedElements));
}
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/newsourcepage/DialogPackageExplorer.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/newsourcepage/DialogPackageExplorer.java
index f791391..d39b98f 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/newsourcepage/DialogPackageExplorer.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/newsourcepage/DialogPackageExplorer.java
@@ -60,14 +60,14 @@
* content provider, label provider, element sorter and filter to display
* elements that are not shown usually in the package explorer of the workspace.
*/
-public abstract class DialogPackageExplorer implements IMenuListener,
- ISelectionChangedListener {
+public abstract class DialogPackageExplorer
+ implements IMenuListener, ISelectionChangedListener {
/**
* A extended content provider for the package explorer which can
* additionally display an output folder item.
*/
- private final class PackageContentProvider extends
- StandardModelElementContentProvider {
+ private final class PackageContentProvider
+ extends StandardModelElementContentProvider {
public PackageContentProvider() {
super();
}
@@ -92,8 +92,8 @@
* A extended label provider for the package explorer which can additionally
* display an output folder item.
*/
- private final class PackageLabelProvider extends
- AppearanceAwareLabelProvider {
+ private final class PackageLabelProvider
+ extends AppearanceAwareLabelProvider {
public PackageLabelProvider(long textFlags, int imageFlags,
IPreferenceStore store) {
@@ -110,14 +110,12 @@
IBuildpathEntry entry = root.getRawBuildpathEntry();
int excluded = entry.getExclusionPatterns().length;
if (excluded == 1)
- return Messages
- .format(
- NewWizardMessages.DialogPackageExplorer_LabelProvider_SingleExcluded,
- text);
+ return Messages.format(
+ NewWizardMessages.DialogPackageExplorer_LabelProvider_SingleExcluded,
+ text);
else if (excluded > 1)
- return Messages
- .format(
- NewWizardMessages.DialogPackageExplorer_LabelProvider_MultiExcluded,
+ return Messages.format(
+ NewWizardMessages.DialogPackageExplorer_LabelProvider_MultiExcluded,
new Object[] { text, excluded });
}
}
@@ -130,27 +128,23 @@
IBuildpathEntry entry = root.getRawBuildpathEntry();
int excluded = entry.getExclusionPatterns().length;
if (excluded == 1)
- return Messages
- .format(
- NewWizardMessages.DialogPackageExplorer_LabelProvider_SingleExcluded,
- text);
+ return Messages.format(
+ NewWizardMessages.DialogPackageExplorer_LabelProvider_SingleExcluded,
+ text);
else if (excluded > 1)
- return Messages
- .format(
- NewWizardMessages.DialogPackageExplorer_LabelProvider_MultiExcluded,
+ return Messages.format(
+ NewWizardMessages.DialogPackageExplorer_LabelProvider_MultiExcluded,
new Object[] { text, excluded });
}
}
}
if (element instanceof IFile || element instanceof IFolder) {
IResource resource = (IResource) element;
- if (resource.exists()
- && BuildpathModifier.isExcluded(resource,
- fCurrJProject))
- return Messages
- .format(
- NewWizardMessages.DialogPackageExplorer_LabelProvider_Excluded,
- text);
+ if (resource.exists() && BuildpathModifier
+ .isExcluded(resource, fCurrJProject))
+ return Messages.format(
+ NewWizardMessages.DialogPackageExplorer_LabelProvider_Excluded,
+ text);
}
} catch (ModelException e) {
DLTKUIPlugin.log(e);
@@ -177,9 +171,8 @@
}
if (element instanceof IFile || element instanceof IFolder) {
IResource resource = (IResource) element;
- if (resource.exists()
- && BuildpathModifier.isExcluded(resource,
- fCurrJProject))
+ if (resource.exists() && BuildpathModifier
+ .isExcluded(resource, fCurrJProject))
return getBlueColor();
}
} catch (ModelException e) {
@@ -235,8 +228,8 @@
try {
if (element instanceof IFile) {
IFile file = (IFile) element;
- if (file.getName().equals(
- IScriptProjectFilenames.BUILDPATH_FILENAME)
+ if (file.getName()
+ .equals(IScriptProjectFilenames.BUILDPATH_FILENAME)
|| file.getName().equals(
IScriptProjectFilenames.PROJECT_FILENAME))
return false;
@@ -244,8 +237,8 @@
if (element instanceof IProjectFragment) {
IBuildpathEntry cpe = ((IProjectFragment) element)
.getRawBuildpathEntry();
- if (cpe == null
- || cpe.getEntryKind() == IBuildpathEntry.BPE_CONTAINER)
+ if (cpe == null || cpe
+ .getEntryKind() == IBuildpathEntry.BPE_CONTAINER)
return false;
}
} catch (ModelException e) {
@@ -253,7 +246,8 @@
}
// if (element instanceof IProjectFragment) {
// IProjectFragment root= (IProjectFragment)element;
- // if (root.getElementName().endsWith(".zip") ) //$NON-NLS-1$ //$NON-NLS-2$
+ // if (root.getElementName().endsWith(".zip") ) //$NON-NLS-1$
+ // //$NON-NLS-2$
// return false;
// }
// return super.select(viewer, parentElement, element);// &&*/
@@ -299,7 +293,7 @@
}
// fPackageViewer.setComparer(WorkingSetModel.COMPARER);
fPackageViewer.addFilter(new PackageFilter());
- fPackageViewer.setSorter(new ExtendedModelElementSorter());
+ fPackageViewer.setComparator(new ExtendedModelElementSorter());
fPackageViewer.addDoubleClickListener(event -> {
Object element = ((IStructuredSelection) event.getSelection())
.getFirstElement();
@@ -364,8 +358,8 @@
| ScriptElementImageProvider.SMALL_ICONS,
getPreferenceStore());
fPackageViewer.setContentProvider(contentProvider);
- fPackageViewer.setLabelProvider(new StyledDecoratingModelLabelProvider(
- labelProvider, false));
+ fPackageViewer.setLabelProvider(
+ new StyledDecoratingModelLabelProvider(labelProvider, false));
}
protected abstract IPreferenceStore getPreferenceStore();
@@ -400,22 +394,20 @@
if (elements == null || elements.size() == 0)
return;
try {
- ResourcesPlugin.getWorkspace().run(
- monitor -> {
- fPackageViewer.refresh();
- final IStructuredSelection selection = new StructuredSelection(
- elements);
- fPackageViewer.setSelection(selection, true);
- fPackageViewer.getTree().setFocus();
- if (fActionGroup != null)
- fActionGroup.refresh(
- new DialogExplorerActionContext(selection,
- fCurrJProject));
+ ResourcesPlugin.getWorkspace().run(monitor -> {
+ fPackageViewer.refresh();
+ final IStructuredSelection selection = new StructuredSelection(
+ elements);
+ fPackageViewer.setSelection(selection, true);
+ fPackageViewer.getTree().setFocus();
+ if (fActionGroup != null)
+ fActionGroup.refresh(new DialogExplorerActionContext(
+ selection, fCurrJProject));
- if (elements.size() == 1
- && elements.get(0) instanceof IScriptProject)
- fPackageViewer.expandToLevel(elements.get(0), 1);
- }, ResourcesPlugin.getWorkspace().getRoot(),
+ if (elements.size() == 1
+ && elements.get(0) instanceof IScriptProject)
+ fPackageViewer.expandToLevel(elements.get(0), 1);
+ }, ResourcesPlugin.getWorkspace().getRoot(),
IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
} catch (CoreException e) {
DLTKUIPlugin.log(e);
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/dialogfields/ListDialogField.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/dialogfields/ListDialogField.java
index b03dfc1..5da8d0b 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/dialogfields/ListDialogField.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/dialogfields/ListDialogField.java
@@ -30,7 +30,7 @@
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
@@ -87,7 +87,7 @@
protected ILabelProvider fLabelProvider;
protected ListViewerAdapter fListViewerAdapter;
protected List<E> fElements;
- protected ViewerSorter fViewerSorter;
+ protected ViewerComparator fViewerSorter;
protected String[] fButtonLabels;
private Button[] fButtonControls;
@@ -188,7 +188,7 @@
* @param viewerSorter
* The viewerSorter to set
*/
- public void setViewerSorter(ViewerSorter viewerSorter) {
+ public void setViewerComparator(ViewerComparator viewerSorter) {
fViewerSorter = viewerSorter;
}
@@ -343,7 +343,8 @@
ColumnLayoutData[] columns = fTableColumns.columns;
for (int i = 0; i < columns.length; i++) {
composite.addColumnData(columns[i]);
- TableColumn column = new TableColumn(tableControl, SWT.NONE);
+ TableColumn column = new TableColumn(tableControl,
+ SWT.NONE);
// tableLayout.addColumnData(columns[i]);
if (fTableColumns.headers != null) {
column.setText(fTableColumns.headers[i]);
@@ -368,7 +369,7 @@
fTable.setInput(fParentElement);
if (fViewerSorter != null) {
- fTable.setSorter(fViewerSorter);
+ fTable.setComparator(fViewerSorter);
}
fTableControl.setEnabled(isEnabled());
@@ -470,8 +471,8 @@
if (currLabel != null) {
fButtonControls[i] = createButton(contents, currLabel,
listener);
- fButtonControls[i].setEnabled(isEnabled()
- && fButtonsEnabled[i]);
+ fButtonControls[i]
+ .setEnabled(isEnabled() && fButtonsEnabled[i]);
} else {
fButtonControls[i] = null;
createSeparator(contents);
@@ -505,9 +506,8 @@
*/
protected void handleKeyPressed(KeyEvent event) {
if (event.character == SWT.DEL && event.stateMask == 0) {
- if (fRemoveButtonIndex != -1
- && isButtonEnabled(fTable.getSelection(),
- fRemoveButtonIndex)) {
+ if (fRemoveButtonIndex != -1 && isButtonEnabled(
+ fTable.getSelection(), fRemoveButtonIndex)) {
managedButtonPressed(fRemoveButtonIndex);
}
}
@@ -925,7 +925,8 @@
// ------- ITableContentProvider Interface ------------
@Override
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ public void inputChanged(Viewer viewer, Object oldInput,
+ Object newInput) {
// will never happen
}
@@ -948,9 +949,8 @@
/*
* (non-Javadoc)
*
- * @see
- * org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse
- * .jface.viewers.DoubleClickEvent)
+ * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.
+ * eclipse .jface.viewers.DoubleClickEvent)
*/
@Override
public void doubleClick(DoubleClickEvent event) {
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/workingsets/ScriptWorkingSetPage.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/workingsets/ScriptWorkingSetPage.java
index 735f669..d00f9d7 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/workingsets/ScriptWorkingSetPage.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/workingsets/ScriptWorkingSetPage.java
@@ -58,20 +58,20 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.IWorkingSetPage;
-
/**
- * The Script working set page allows the user to create
- * and edit a Script working set.
+ * The Script working set page allows the user to create and edit a Script
+ * working set.
* <p>
* Working set elements are presented as a Script element tree.
* </p>
*
- *
+ *
*/
-public class ScriptWorkingSetPage extends WizardPage implements IWorkingSetPage {
+public class ScriptWorkingSetPage extends WizardPage
+ implements IWorkingSetPage {
- final private static String PAGE_TITLE= WorkingSetMessages.ScriptWorkingSetPage_title;
- final private static String PAGE_ID= "ScriptWorkingSetPage"; //$NON-NLS-1$
+ final private static String PAGE_TITLE = WorkingSetMessages.ScriptWorkingSetPage_title;
+ final private static String PAGE_ID = "ScriptWorkingSetPage"; //$NON-NLS-1$
private Text fWorkingSetName;
private CheckboxTreeViewer fTree;
@@ -84,65 +84,75 @@
* Default constructor.
*/
public ScriptWorkingSetPage() {
- super(PAGE_ID, PAGE_TITLE, DLTKPluginImages.DESC_WIZBAN_SCRIPT_WORKINGSET);
- setDescription(WorkingSetMessages.ScriptWorkingSetPage_workingSet_description);
- fFirstCheck= true;
+ super(PAGE_ID, PAGE_TITLE,
+ DLTKPluginImages.DESC_WIZBAN_SCRIPT_WORKINGSET);
+ setDescription(
+ WorkingSetMessages.ScriptWorkingSetPage_workingSet_description);
+ fFirstCheck = true;
}
/*
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+ * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.
+ * widgets.Composite)
*/
@Override
public void createControl(Composite parent) {
initializeDialogUnits(parent);
- Composite composite= new Composite(parent, SWT.NONE);
+ Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new GridLayout());
composite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
setControl(composite);
- Label label= new Label(composite, SWT.WRAP);
+ Label label = new Label(composite, SWT.WRAP);
label.setText(WorkingSetMessages.ScriptWorkingSetPage_workingSet_name);
- GridData gd= new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
+ GridData gd = new GridData(
+ GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL
+ | GridData.VERTICAL_ALIGN_CENTER);
label.setLayoutData(gd);
- fWorkingSetName= new Text(composite, SWT.SINGLE | SWT.BORDER);
- fWorkingSetName.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
- fWorkingSetName.addModifyListener(
- e -> validateInput()
- );
+ fWorkingSetName = new Text(composite, SWT.SINGLE | SWT.BORDER);
+ fWorkingSetName.setLayoutData(new GridData(
+ GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
+ fWorkingSetName.addModifyListener(e -> validateInput());
fWorkingSetName.setFocus();
- label= new Label(composite, SWT.WRAP);
- label.setText(WorkingSetMessages.ScriptWorkingSetPage_workingSet_content);
- gd= new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
+ label = new Label(composite, SWT.WRAP);
+ label.setText(
+ WorkingSetMessages.ScriptWorkingSetPage_workingSet_content);
+ gd = new GridData(
+ GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL
+ | GridData.VERTICAL_ALIGN_CENTER);
label.setLayoutData(gd);
- fTree= new CheckboxTreeViewer(composite, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- gd= new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL);
- gd.heightHint= convertHeightInCharsToPixels(15);
+ fTree = new CheckboxTreeViewer(composite,
+ SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
+ gd = new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL);
+ gd.heightHint = convertHeightInCharsToPixels(15);
fTree.getControl().setLayoutData(gd);
- fTreeContentProvider= new ScriptWorkingSetPageContentProvider();
+ fTreeContentProvider = new ScriptWorkingSetPageContentProvider();
fTree.setContentProvider(fTreeContentProvider);
- AppearanceAwareLabelProvider fScriptElementLabelProvider=
- new AppearanceAwareLabelProvider(
- AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS | ScriptElementLabels.P_COMPRESSED,
- AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS | ScriptElementImageProvider.SMALL_ICONS,
- DLTKUIPlugin.getDefault().getPreferenceStore()
- );
+ AppearanceAwareLabelProvider fScriptElementLabelProvider = new AppearanceAwareLabelProvider(
+ AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS
+ | ScriptElementLabels.P_COMPRESSED,
+ AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS
+ | ScriptElementImageProvider.SMALL_ICONS,
+ DLTKUIPlugin.getDefault().getPreferenceStore());
fTree.setLabelProvider(new StyledDecoratingModelLabelProvider(
fScriptElementLabelProvider));
- fTree.setSorter(new ModelElementSorter());
+ fTree.setComparator(new ModelElementSorter());
if (DLTKCore.DEBUG) {
- System.err.println("Add empty inner package filter support here..."); //$NON-NLS-1$
+ System.err
+ .println("Add empty inner package filter support here..."); //$NON-NLS-1$
}
- //fTree.addFilter(new EmptyInnerPackageFilter());
+ // fTree.addFilter(new EmptyInnerPackageFilter());
fTree.setUseHashlookup(true);
- fTree.setInput(DLTKCore.create(ResourcesPlugin.getWorkspace().getRoot()));
+ fTree.setInput(
+ DLTKCore.create(ResourcesPlugin.getWorkspace().getRoot()));
fTree.addCheckStateListener(event -> handleCheckStateChange(event));
@@ -150,9 +160,10 @@
@Override
public void treeCollapsed(TreeExpansionEvent event) {
}
+
@Override
public void treeExpanded(TreeExpansionEvent event) {
- final Object element= event.getElement();
+ final Object element = event.getElement();
if (fTree.getGrayed(element) == false)
BusyIndicator.showWhile(getShell().getDisplay(),
() -> setSubtreeChecked(element,
@@ -162,18 +173,23 @@
// Add select / deselect all buttons for bug 46669
Composite buttonComposite = new Composite(composite, SWT.NONE);
- GridLayout layout= new GridLayout(2, false);
- layout.marginWidth= 0; layout.marginHeight= 0;
+ GridLayout layout = new GridLayout(2, false);
+ layout.marginWidth = 0;
+ layout.marginHeight = 0;
buttonComposite.setLayout(layout);
- buttonComposite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
+ buttonComposite
+ .setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
Button selectAllButton = new Button(buttonComposite, SWT.PUSH);
- selectAllButton.setText(WorkingSetMessages.ScriptWorkingSetPage_selectAll_label);
- selectAllButton.setToolTipText(WorkingSetMessages.ScriptWorkingSetPage_selectAll_toolTip);
+ selectAllButton.setText(
+ WorkingSetMessages.ScriptWorkingSetPage_selectAll_label);
+ selectAllButton.setToolTipText(
+ WorkingSetMessages.ScriptWorkingSetPage_selectAll_toolTip);
selectAllButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent selectionEvent) {
- fTree.setCheckedElements(fTreeContentProvider.getElements(fTree.getInput()));
+ fTree.setCheckedElements(
+ fTreeContentProvider.getElements(fTree.getInput()));
validateInput();
}
});
@@ -181,8 +197,10 @@
SWTUtil.setButtonDimensionHint(selectAllButton);
Button deselectAllButton = new Button(buttonComposite, SWT.PUSH);
- deselectAllButton.setText(WorkingSetMessages.ScriptWorkingSetPage_deselectAll_label);
- deselectAllButton.setToolTipText(WorkingSetMessages.ScriptWorkingSetPage_deselectAll_toolTip);
+ deselectAllButton.setText(
+ WorkingSetMessages.ScriptWorkingSetPage_deselectAll_label);
+ deselectAllButton.setToolTipText(
+ WorkingSetMessages.ScriptWorkingSetPage_deselectAll_toolTip);
deselectAllButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent selectionEvent) {
@@ -203,7 +221,8 @@
if (DLTKCore.DEBUG) {
System.err.println("Add help support here..."); //$NON-NLS-1$
}
- //ScriptUIHelp.setHelp(fTree, IScriptHelpContextIds.Script_WORKING_SET_PAGE);
+ // ScriptUIHelp.setHelp(fTree,
+ // IScriptHelpContextIds.Script_WORKING_SET_PAGE);
}
/*
@@ -220,9 +239,10 @@
@Override
public void setSelection(IWorkingSet workingSet) {
Assert.isNotNull(workingSet, "Working set must not be null"); //$NON-NLS-1$
- fWorkingSet= workingSet;
- if (getContainer() != null && getShell() != null && fWorkingSetName != null) {
- fFirstCheck= false;
+ fWorkingSet = workingSet;
+ if (getContainer() != null && getShell() != null
+ && fWorkingSetName != null) {
+ fFirstCheck = false;
fWorkingSetName.setText(fWorkingSet.getName());
initializeCheckedState();
validateInput();
@@ -234,27 +254,30 @@
*/
@Override
public void finish() {
- String workingSetName= fWorkingSetName.getText();
+ String workingSetName = fWorkingSetName.getText();
ArrayList<IAdaptable> elements = new ArrayList<IAdaptable>(10);
findCheckedElements(elements, fTree.getInput());
if (fWorkingSet == null) {
- IWorkingSetManager workingSetManager= PlatformUI.getWorkbench().getWorkingSetManager();
+ IWorkingSetManager workingSetManager = PlatformUI.getWorkbench()
+ .getWorkingSetManager();
fWorkingSet = workingSetManager.createWorkingSet(workingSetName,
elements.toArray(new IAdaptable[elements.size()]));
} else {
// Add inaccessible resources
- IAdaptable[] oldItems= fWorkingSet.getElements();
- ArrayList closedWithChildren= new ArrayList(elements.size());
- for (int i= 0; i < oldItems.length; i++) {
- IResource oldResource= null;
+ IAdaptable[] oldItems = fWorkingSet.getElements();
+ ArrayList closedWithChildren = new ArrayList(elements.size());
+ for (int i = 0; i < oldItems.length; i++) {
+ IResource oldResource = null;
if (oldItems[i] instanceof IResource) {
- oldResource= (IResource)oldItems[i];
+ oldResource = (IResource) oldItems[i];
} else {
oldResource = oldItems[i].getAdapter(IResource.class);
}
- if (oldResource != null && oldResource.isAccessible() == false) {
- IProject project= oldResource.getProject();
- if (elements.contains(project) || closedWithChildren.contains(project)) {
+ if (oldResource != null
+ && oldResource.isAccessible() == false) {
+ IProject project = oldResource.getProject();
+ if (elements.contains(project)
+ || closedWithChildren.contains(project)) {
elements.add(oldItems[i]);
elements.remove(project);
closedWithChildren.add(project);
@@ -268,35 +291,36 @@
}
private void validateInput() {
- String errorMessage= null;
- String infoMessage= null;
- String newText= fWorkingSetName.getText();
+ String errorMessage = null;
+ String infoMessage = null;
+ String newText = fWorkingSetName.getText();
if (newText.equals(newText.trim()) == false)
errorMessage = WorkingSetMessages.ScriptWorkingSetPage_warning_nameWhitespace;
if (newText.equals("")) { //$NON-NLS-1$
if (fFirstCheck) {
setPageComplete(false);
- fFirstCheck= false;
+ fFirstCheck = false;
return;
- }
- else
- errorMessage= WorkingSetMessages.ScriptWorkingSetPage_warning_nameMustNotBeEmpty;
+ } else
+ errorMessage = WorkingSetMessages.ScriptWorkingSetPage_warning_nameMustNotBeEmpty;
}
- fFirstCheck= false;
+ fFirstCheck = false;
- if (errorMessage == null && (fWorkingSet == null || newText.equals(fWorkingSet.getName()) == false)) {
- IWorkingSet[] workingSets= PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets();
- for (int i= 0; i < workingSets.length; i++) {
+ if (errorMessage == null && (fWorkingSet == null
+ || newText.equals(fWorkingSet.getName()) == false)) {
+ IWorkingSet[] workingSets = PlatformUI.getWorkbench()
+ .getWorkingSetManager().getWorkingSets();
+ for (int i = 0; i < workingSets.length; i++) {
if (newText.equals(workingSets[i].getName())) {
- errorMessage= WorkingSetMessages.ScriptWorkingSetPage_warning_workingSetExists;
+ errorMessage = WorkingSetMessages.ScriptWorkingSetPage_warning_workingSetExists;
}
}
}
if (!hasCheckedElement())
- infoMessage= WorkingSetMessages.ScriptWorkingSetPage_warning_resourceMustBeChecked;
+ infoMessage = WorkingSetMessages.ScriptWorkingSetPage_warning_resourceMustBeChecked;
setMessage(infoMessage, INFORMATION);
setErrorMessage(errorMessage);
@@ -304,8 +328,8 @@
}
private boolean hasCheckedElement() {
- TreeItem[] items= fTree.getTree().getItems();
- for (int i= 0; i < items.length; i++) {
+ TreeItem[] items = fTree.getTree().getItems();
+ for (int i = 0; i < items.length; i++) {
if (items[i].getChecked())
return true;
}
@@ -313,8 +337,8 @@
}
private void findCheckedElements(List checkedResources, Object parent) {
- Object[] children= fTreeContentProvider.getChildren(parent);
- for (int i= 0; i < children.length; i++) {
+ Object[] children = fTreeContentProvider.getChildren(parent);
+ for (int i = 0; i < children.length; i++) {
if (fTree.getGrayed(children[i]))
findCheckedElements(checkedResources, children[i]);
else if (fTree.getChecked(children[i]))
@@ -337,22 +361,23 @@
});
}
- private void setSubtreeChecked(Object parent, boolean state, boolean checkExpandedState) {
+ private void setSubtreeChecked(Object parent, boolean state,
+ boolean checkExpandedState) {
if (!(parent instanceof IAdaptable))
return;
IContainer container = ((IAdaptable) parent)
.getAdapter(IContainer.class);
- if ((!fTree.getExpandedState(parent) && checkExpandedState) || (container != null && !container.isAccessible()))
+ if ((!fTree.getExpandedState(parent) && checkExpandedState)
+ || (container != null && !container.isAccessible()))
return;
- Object[] children= fTreeContentProvider.getChildren(parent);
- for (int i= children.length - 1; i >= 0; i--) {
- Object element= children[i];
+ Object[] children = fTreeContentProvider.getChildren(parent);
+ for (int i = children.length - 1; i >= 0; i--) {
+ Object element = children[i];
if (state) {
fTree.setChecked(element, true);
fTree.setGrayed(element, false);
- }
- else
+ } else
fTree.setGrayChecked(element, false);
if (isExpandable(element))
setSubtreeChecked(element, state, true);
@@ -368,17 +393,18 @@
if (resource != null && !resource.isAccessible())
return;
}
- Object parent= fTreeContentProvider.getParent(child);
+ Object parent = fTreeContentProvider.getParent(child);
if (parent == null)
return;
- boolean allSameState= true;
- Object[] children= null;
- children= fTreeContentProvider.getChildren(parent);
+ boolean allSameState = true;
+ Object[] children = null;
+ children = fTreeContentProvider.getChildren(parent);
- for (int i= children.length -1; i >= 0; i--) {
- if (fTree.getChecked(children[i]) != baseChildState || fTree.getGrayed(children[i])) {
- allSameState= false;
+ for (int i = children.length - 1; i >= 0; i--) {
+ if (fTree.getChecked(children[i]) != baseChildState
+ || fTree.getGrayed(children[i])) {
+ allSameState = false;
break;
}
}
@@ -452,15 +478,10 @@
}
private boolean isExpandable(Object element) {
- return (
- element instanceof IScriptProject
- ||
- element instanceof IProjectFragment
- ||
- element instanceof IScriptFolder
- ||
- element instanceof IScriptModel
- ||
- element instanceof IContainer);
+ return (element instanceof IScriptProject
+ || element instanceof IProjectFragment
+ || element instanceof IScriptFolder
+ || element instanceof IScriptModel
+ || element instanceof IContainer);
}
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ext/ExtendedClassesView.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ext/ExtendedClassesView.java
index dae730d..f489eff 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ext/ExtendedClassesView.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ext/ExtendedClassesView.java
@@ -154,7 +154,7 @@
protected void configureViewer(TreeViewer viewer) {
// viewer.setCom
viewer.setUseHashlookup(true);
- viewer.setSorter(new ModelElementSorter() {
+ viewer.setComparator(new ModelElementSorter() {
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
e1 = unWrap(e1);
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/AbstractScriptEditorColoringConfigurationBlock.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/AbstractScriptEditorColoringConfigurationBlock.java
index 74ccb9d..243f592 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/AbstractScriptEditorColoringConfigurationBlock.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/AbstractScriptEditorColoringConfigurationBlock.java
@@ -56,7 +56,7 @@
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -200,8 +200,8 @@
}
}
- private static class SemanticHighlightingColorListItem extends
- HighlightingColorListItem {
+ private static class SemanticHighlightingColorListItem
+ extends HighlightingColorListItem {
/** Enablement preference key */
private final String fEnableKey;
@@ -295,7 +295,8 @@
}
@Override
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ public void inputChanged(Viewer viewer, Object oldInput,
+ Object newInput) {
}
@Override
@@ -408,7 +409,8 @@
protected abstract ProjectionViewer createPreviewViewer(Composite parent,
IVerticalRuler verticalRuler, IOverviewRuler overviewRuler,
- boolean showAnnotationsOverview, int styles, IPreferenceStore store);
+ boolean showAnnotationsOverview, int styles,
+ IPreferenceStore store);
protected abstract ScriptSourceViewerConfiguration createSimpleSourceViewerConfiguration(
IColorManager colorManager, IPreferenceStore preferenceStore,
@@ -444,17 +446,11 @@
colorKey + STRIKETHROUGH, colorKey + UNDERLINE,
model[i][2]));
} else {
- fListModel
- .add(new SemanticHighlightingColorListItem(
- model[i][0],
- colorKey,
- colorKey + BOLD,
- colorKey + ITALIC,
- colorKey + STRIKETHROUGH,
- colorKey + UNDERLINE,
- model[i][2],
- colorKey
- + EDITOR_SEMANTIC_HIGHLIGHTING_ENABLED_SUFFIX));
+ fListModel.add(new SemanticHighlightingColorListItem(
+ model[i][0], colorKey, colorKey + BOLD,
+ colorKey + ITALIC, colorKey + STRIKETHROUGH,
+ colorKey + UNDERLINE, model[i][2], colorKey
+ + EDITOR_SEMANTIC_HIGHLIGHTING_ENABLED_SUFFIX));
}
}
}
@@ -464,11 +460,11 @@
if (h.isSemanticOnly()) {
final String colorKey = h.getPreferenceKey();
if (colorKeys.add(colorKey)) {
- fListModel.add(new SemanticHighlightingColorListItem(h
- .getDisplayName(), colorKey, colorKey + BOLD,
+ fListModel.add(new SemanticHighlightingColorListItem(
+ h.getDisplayName(), colorKey, colorKey + BOLD,
colorKey + ITALIC, colorKey + STRIKETHROUGH,
- colorKey + UNDERLINE, sCoreCategory, h
- .getEnabledPreferenceKey()));
+ colorKey + UNDERLINE, sCoreCategory,
+ h.getEnabledPreferenceKey()));
}
} else if (!colorKeys.contains(h.getPreferenceKey())) {
final String msgText = PreferencesMessages.DLTKEditorPreferencePage_coloring_semantic_not_configurable;
@@ -491,10 +487,9 @@
OverlayPreferenceStore.BOOLEAN, item.getBoldKey()));
overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
OverlayPreferenceStore.BOOLEAN, item.getItalicKey()));
- overlayKeys
- .add(new OverlayPreferenceStore.OverlayKey(
- OverlayPreferenceStore.BOOLEAN, item
- .getStrikethroughKey()));
+ overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+ OverlayPreferenceStore.BOOLEAN,
+ item.getStrikethroughKey()));
overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
OverlayPreferenceStore.BOOLEAN, item.getUnderlineKey()));
@@ -568,14 +563,14 @@
RGB rgb = PreferenceConverter.getColor(getPreferenceStore(),
item.getColorKey());
fSyntaxForegroundColorEditor.setColorValue(rgb);
- fBoldCheckBox.setSelection(getPreferenceStore().getBoolean(
- item.getBoldKey()));
- fItalicCheckBox.setSelection(getPreferenceStore().getBoolean(
- item.getItalicKey()));
- fStrikethroughCheckBox.setSelection(getPreferenceStore().getBoolean(
- item.getStrikethroughKey()));
- fUnderlineCheckBox.setSelection(getPreferenceStore().getBoolean(
- item.getUnderlineKey()));
+ fBoldCheckBox.setSelection(
+ getPreferenceStore().getBoolean(item.getBoldKey()));
+ fItalicCheckBox.setSelection(
+ getPreferenceStore().getBoolean(item.getItalicKey()));
+ fStrikethroughCheckBox.setSelection(
+ getPreferenceStore().getBoolean(item.getStrikethroughKey()));
+ fUnderlineCheckBox.setSelection(
+ getPreferenceStore().getBoolean(item.getUnderlineKey()));
if (item instanceof SemanticHighlightingColorListItem) {
fEnableCheckbox.setEnabled(true);
boolean enable = getPreferenceStore().getBoolean(
@@ -608,7 +603,8 @@
colorComposite.setLayout(layout);
Link link = new Link(colorComposite, SWT.NONE);
- link.setText(PreferencesMessages.DLTKEditorColoringConfigurationBlock_link);
+ link.setText(
+ PreferencesMessages.DLTKEditorColoringConfigurationBlock_link);
link.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -631,7 +627,8 @@
Label label;
label = new Label(colorComposite, SWT.LEFT);
- label.setText(PreferencesMessages.DLTKEditorPreferencePage_coloring_element);
+ label.setText(
+ PreferencesMessages.DLTKEditorPreferencePage_coloring_element);
label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Composite editorComposite = new Composite(colorComposite, SWT.NONE);
@@ -646,7 +643,7 @@
fListViewer = new TreeViewer(editorComposite, SWT.SINGLE | SWT.BORDER);
fListViewer.setLabelProvider(new ColorListLabelProvider());
fListViewer.setContentProvider(getColorListContentProvider());
- fListViewer.setSorter(new ViewerSorter() {
+ fListViewer.setComparator(new ViewerComparator() {
@Override
public int category(Object element) {
// don't sort the top level categories
@@ -669,8 +666,8 @@
gd.heightHint = convertHeightInCharsToPixels(9);
int maxWidth = 0;
for (HighlightingColorListItem item : fListModel) {
- maxWidth = Math.max(maxWidth, convertWidthInCharsToPixels(item
- .getDisplayName().length()));
+ maxWidth = Math.max(maxWidth, convertWidthInCharsToPixels(
+ item.getDisplayName().length()));
}
ScrollBar vBar = ((Scrollable) fListViewer.getControl())
.getVerticalBar();
@@ -726,16 +723,16 @@
fItalicCheckBox.setLayoutData(gd);
fStrikethroughCheckBox = new Button(stylesComposite, SWT.CHECK);
- fStrikethroughCheckBox
- .setText(PreferencesMessages.DLTKEditorPreferencePage_strikethrough);
+ fStrikethroughCheckBox.setText(
+ PreferencesMessages.DLTKEditorPreferencePage_strikethrough);
gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
gd.horizontalIndent = 20;
gd.horizontalSpan = 2;
fStrikethroughCheckBox.setLayoutData(gd);
fUnderlineCheckBox = new Button(stylesComposite, SWT.CHECK);
- fUnderlineCheckBox
- .setText(PreferencesMessages.DLTKEditorPreferencePage_underline);
+ fUnderlineCheckBox.setText(
+ PreferencesMessages.DLTKEditorPreferencePage_underline);
gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
gd.horizontalIndent = 20;
gd.horizontalSpan = 2;
@@ -755,8 +752,8 @@
label.dispose();
}
- fListViewer
- .addSelectionChangedListener(event -> handleSyntaxColorListSelection());
+ fListViewer.addSelectionChangedListener(
+ event -> handleSyntaxColorListSelection());
foregroundColorButton.addSelectionListener(new SelectionListener() {
@Override
@@ -839,8 +836,8 @@
HighlightingColorListItem item = getHighlightingColorListItem();
if (item instanceof SemanticHighlightingColorListItem) {
boolean enable = fEnableCheckbox.getSelection();
- getPreferenceStore().setValue(
- ((SemanticHighlightingColorListItem) item)
+ getPreferenceStore()
+ .setValue(((SemanticHighlightingColorListItem) item)
.getEnableKey(), enable);
fEnableCheckbox.setSelection(enable);
fSyntaxForegroundColorEditor.getButton().setEnabled(enable);
@@ -880,8 +877,7 @@
IPreferenceStore generalTextStore = EditorsUI.getPreferenceStore();
IPreferenceStore store = new ChainedPreferenceStore(
- new IPreferenceStore[] {
- getPreferenceStore(),
+ new IPreferenceStore[] { getPreferenceStore(),
new PreferencesAdapter(
createTemporaryCorePreferenceStore()),
generalTextStore });
@@ -988,8 +984,8 @@
BufferedReader reader = null;
try {
- reader = new BufferedReader(new InputStreamReader(
- getPreviewContentReader()));
+ reader = new BufferedReader(
+ new InputStreamReader(getPreviewContentReader()));
String line = null;
while ((line = reader.readLine()) != null) {
if (buffer.length() != 0) {
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/AbstractTodoTaskOptionsBlock.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/AbstractTodoTaskOptionsBlock.java
index e3d1550..e086a36 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/AbstractTodoTaskOptionsBlock.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/AbstractTodoTaskOptionsBlock.java
@@ -181,7 +181,7 @@
PreferencesMessages.TodoTaskConfigurationBlock_markers_tasks_priority_column, };
fTodoTasksList.setTableColumns(
new ListDialogField.ColumnsDescription(columnsHeaders, true));
- fTodoTasksList.setViewerSorter(new TodoTaskSorter());
+ fTodoTasksList.setViewerComparator(new TodoTaskSorter());
final GridLayout layout = new GridLayout();
layout.marginHeight = 0;
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/TodoTaskConfigurationBlock.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/TodoTaskConfigurationBlock.java
index f8e783a..2beecaa 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/TodoTaskConfigurationBlock.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/TodoTaskConfigurationBlock.java
@@ -45,8 +45,8 @@
@Deprecated
public class TodoTaskConfigurationBlock extends AbstractConfigurationBlock {
- private class TodoTaskLabelProvider extends LabelProvider implements
- ITableLabelProvider {
+ private class TodoTaskLabelProvider extends LabelProvider
+ implements ITableLabelProvider {
@Override
public Image getImage(Object element) {
@@ -109,7 +109,8 @@
private OverlayKey[] createKeys() {
return new OverlayPreferenceStore.OverlayKey[] {
new OverlayPreferenceStore.OverlayKey(
- OverlayPreferenceStore.STRING, TodoTaskPreferences.TAGS),
+ OverlayPreferenceStore.STRING,
+ TodoTaskPreferences.TAGS),
new OverlayPreferenceStore.OverlayKey(
OverlayPreferenceStore.BOOLEAN,
TodoTaskPreferences.ENABLED),
@@ -186,9 +187,9 @@
final String[] columnsHeaders = new String[] {
PreferencesMessages.TodoTaskConfigurationBlock_markers_tasks_name_column,
PreferencesMessages.TodoTaskConfigurationBlock_markers_tasks_priority_column, };
- fTodoTasksList.setTableColumns(new ListDialogField.ColumnsDescription(
- columnsHeaders, true));
- fTodoTasksList.setViewerSorter(new TodoTaskSorter());
+ fTodoTasksList.setTableColumns(
+ new ListDialogField.ColumnsDescription(columnsHeaders, true));
+ fTodoTasksList.setViewerComparator(new TodoTaskSorter());
final GridLayout layout = new GridLayout();
layout.marginHeight = 0;
@@ -205,8 +206,7 @@
PreferencesMessages.TodoTaskConfigurationBlock_enableTaskTags,
TodoTaskPreferences.ENABLED, 0);
- fCaseSensitiveCheckbox = addCheckBox(
- markersComposite,
+ fCaseSensitiveCheckbox = addCheckBox(markersComposite,
PreferencesMessages.TodoTaskConfigurationBlock_casesensitive_label,
TodoTaskPreferences.CASE_SENSITIVE, 0);
@@ -214,8 +214,8 @@
data.widthHint = conv.convertWidthInCharsToPixels(50);
fTodoTasksList.getListControl(markersComposite).setLayoutData(data);
- fTodoTasksList.getButtonBox(markersComposite).setLayoutData(
- new GridData(GridData.HORIZONTAL_ALIGN_FILL
+ fTodoTasksList.getButtonBox(markersComposite)
+ .setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL
| GridData.VERTICAL_ALIGN_BEGINNING));
enableCheckbox.addSelectionListener(new SelectionAdapter() {
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/UserLibraryPreferencePage.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/UserLibraryPreferencePage.java
index 02b31db..062eee1 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/UserLibraryPreferencePage.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/UserLibraryPreferencePage.java
@@ -121,8 +121,8 @@
public static final String DATA_DO_CREATE = "do_create"; //$NON-NLS-1$
public static final String DATA_LIBRARY_TO_SELECT = "select_library"; //$NON-NLS-1$
- public static class LibraryNameDialog extends StatusDialog implements
- IDialogFieldListener {
+ public static class LibraryNameDialog extends StatusDialog
+ implements IDialogFieldListener {
private StringDialogField fNameField;
private SelectionButtonDialogField fIsSystemField;
@@ -134,9 +134,11 @@
BPUserLibraryElement elementToEdit, List existingLibraries) {
super(parent);
if (elementToEdit == null) {
- setTitle(PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_new_title);
+ setTitle(
+ PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_new_title);
} else {
- setTitle(PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_edit_title);
+ setTitle(
+ PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_edit_title);
}
fElementToEdit = elementToEdit;
@@ -144,12 +146,12 @@
fNameField = new StringDialogField();
fNameField.setDialogFieldListener(this);
- fNameField
- .setLabelText(PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_name_label);
+ fNameField.setLabelText(
+ PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_name_label);
fIsSystemField = new SelectionButtonDialogField(SWT.CHECK);
- fIsSystemField
- .setLabelText(PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_issystem_label);
+ fIsSystemField.setLabelText(
+ PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_issystem_label);
if (elementToEdit != null) {
fNameField.setText(elementToEdit.getName());
@@ -163,9 +165,9 @@
@Override
protected Control createDialogArea(Composite parent) {
Composite composite = (Composite) super.createDialogArea(parent);
- LayoutUtil.doDefaultLayout(composite, new DialogField[] {
- fNameField, fIsSystemField }, false, SWT.DEFAULT,
- SWT.DEFAULT);
+ LayoutUtil.doDefaultLayout(composite,
+ new DialogField[] { fNameField, fIsSystemField }, false,
+ SWT.DEFAULT, SWT.DEFAULT);
fNameField.postSetFocusOnDialogField(parent.getDisplay());
// fNameField.doFillIntoGrid(composite, 2);
@@ -187,20 +189,16 @@
private IStatus validateSettings() {
String name = fNameField.getText();
if (name.length() == 0) {
- return new StatusInfo(
- IStatus.ERROR,
+ return new StatusInfo(IStatus.ERROR,
PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_name_error_entername);
}
for (int i = 0; i < fExistingLibraries.size(); i++) {
BPUserLibraryElement curr = (BPUserLibraryElement) fExistingLibraries
.get(i);
if (curr != fElementToEdit && name.equals(curr.getName())) {
- return new StatusInfo(
- IStatus.ERROR,
- Messages
- .format(
- PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_name_error_exists,
- name));
+ return new StatusInfo(IStatus.ERROR, Messages.format(
+ PreferencesMessages.UserLibraryPreferencePage_LibraryNameDialog_name_error_exists,
+ name));
}
}
IStatus status = ResourcesPlugin.getWorkspace().validateName(name,
@@ -228,7 +226,9 @@
public static class LoadSaveDialog extends StatusDialog implements
IStringButtonAdapter, IDialogFieldListener, IListAdapter {
- private static final String VERSION1 = "1"; //$NON-NLS-1$ // using OS strings for archive path and source attachment
+ private static final String VERSION1 = "1"; //$NON-NLS-1$ // using OS
+ // strings for archive path
+ // and source attachment
private static final String CURRENT_VERSION = "2"; //$NON-NLS-1$
private static final String TAG_ROOT = "eclipse-userlibraries"; //$NON-NLS-1$
@@ -273,23 +273,25 @@
int defaultHeigth = convertHeightInCharsToPixels(34);
String lastSize = fSettings.get(PREF_USER_LIBRARY_LOADSAVE_SIZE);
if (lastSize != null) {
- fInitialSize = StringConverter.asPoint(lastSize, new Point(
- defaultWidth, defaultHeigth));
+ fInitialSize = StringConverter.asPoint(lastSize,
+ new Point(defaultWidth, defaultHeigth));
} else {
fInitialSize = new Point(defaultWidth, defaultHeigth);
}
if (isSave()) {
- setTitle(PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_save_title);
+ setTitle(
+ PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_save_title);
} else {
- setTitle(PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_load_title);
+ setTitle(
+ PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_load_title);
}
fLocationField = new StringButtonDialogField(this);
- fLocationField
- .setLabelText(PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_location_label);
- fLocationField
- .setButtonLabel(PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_location_button);
+ fLocationField.setLabelText(
+ PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_location_label);
+ fLocationField.setButtonLabel(
+ PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_location_button);
fLocationField.setDialogFieldListener(this);
String[] buttonNames = new String[] {
@@ -299,16 +301,16 @@
new BPListLabelProvider());
fExportImportList.setCheckAllButtonIndex(0);
fExportImportList.setUncheckAllButtonIndex(1);
- fExportImportList.setViewerSorter(new BPListElementSorter());
+ fExportImportList.setViewerComparator(new BPListElementSorter());
fExportImportList.setDialogFieldListener(this);
if (isSave()) {
- fExportImportList
- .setLabelText(PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_list_save_label);
+ fExportImportList.setLabelText(
+ PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_list_save_label);
fExportImportList.setElements(fExistingLibraries);
fExportImportList.checkAll(true);
} else {
- fExportImportList
- .setLabelText(PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_list_load_label);
+ fExportImportList.setLabelText(
+ PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_list_load_label);
}
String lastPath = fSettings.get(PREF_LASTPATH);
if (lastPath != null) {
@@ -337,14 +339,16 @@
Composite composite = (Composite) super.createDialogArea(parent);
DialogField[] fields;
if (isSave()) {
- fields = new DialogField[] { fExportImportList, fLocationField };
+ fields = new DialogField[] { fExportImportList,
+ fLocationField };
} else {
- fields = new DialogField[] { fLocationField, fExportImportList };
+ fields = new DialogField[] { fLocationField,
+ fExportImportList };
}
LayoutUtil.doDefaultLayout(composite, fields, true, SWT.DEFAULT,
SWT.DEFAULT);
- fExportImportList.getListControl(null).setLayoutData(
- new GridData(GridData.FILL_BOTH));
+ fExportImportList.getListControl(null)
+ .setLayoutData(new GridData(GridData.FILL_BOTH));
fLocationField.postSetFocusOnDialogField(parent.getDisplay());
@@ -363,14 +367,14 @@
@Override
public void changeControlPressed(DialogField field) {
- String label = isSave() ? PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_filedialog_save_title
+ String label = isSave()
+ ? PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_filedialog_save_title
: PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_filedialog_load_title;
- FileDialog dialog = new FileDialog(getShell(), isSave() ? SWT.SAVE
- : SWT.OPEN);
+ FileDialog dialog = new FileDialog(getShell(),
+ isSave() ? SWT.SAVE : SWT.OPEN);
dialog.setText(label);
- dialog
- .setFilterExtensions(new String[] {
- "*.userlibraries", "*.*" }); //$NON-NLS-1$ //$NON-NLS-2$
+ dialog.setFilterExtensions(
+ new String[] { "*.userlibraries", "*.*" }); //$NON-NLS-1$ //$NON-NLS-2$
String lastPath = fLocationField.getText();
if (lastPath.length() == 0 || !new File(lastPath).exists()) {
lastPath = fSettings.get(PREF_LASTPATH);
@@ -400,15 +404,13 @@
fExportImportList.checkAll(true);
fExportImportList.setEnabled(true);
if (elements.isEmpty()) {
- return new StatusInfo(
- IStatus.ERROR,
+ return new StatusInfo(IStatus.ERROR,
PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_error_empty);
}
} catch (IOException e) {
fExportImportList.removeAllElements();
fExportImportList.setEnabled(false);
- return new StatusInfo(
- IStatus.ERROR,
+ return new StatusInfo(IStatus.ERROR,
PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_error_invalidfile);
}
}
@@ -442,8 +444,8 @@
List selectedElements = fExportImportList.getSelectedElements();
if (selectedElements.size() == 1) {
Object elem = selectedElements.get(0);
- fExportImportList.setChecked(elem, !fExportImportList
- .isChecked(elem));
+ fExportImportList.setChecked(elem,
+ !fExportImportList.isChecked(elem));
}
}
@@ -454,7 +456,8 @@
if (file.exists()) {
String title = PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_overwrite_title;
String message = PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_overwrite_message;
- if (!MessageDialog.openQuestion(getShell(), title, message)) {
+ if (!MessageDialog.openQuestion(getShell(), title,
+ message)) {
return;
}
}
@@ -463,10 +466,10 @@
IPath filePath = Path.fromOSString(file.getCanonicalPath());
final IPath workspacePath = ResourcesPlugin.getWorkspace()
.getRoot().getLocation();
- if (filePath.matchingFirstSegments(workspacePath) == workspacePath
- .segmentCount()) {
- IPath path = filePath.removeFirstSegments(workspacePath
- .segmentCount());
+ if (filePath.matchingFirstSegments(
+ workspacePath) == workspacePath.segmentCount()) {
+ IPath path = filePath.removeFirstSegments(
+ workspacePath.segmentCount());
if (path.segmentCount() > 1) {
IFile result = ResourcesPlugin.getWorkspace()
.getRoot().getFile(path);
@@ -484,20 +487,18 @@
.getProgressService();
try {
context.run(true, true, monitor -> {
-try {
- saveLibraries(elements, file, charset,
- monitor);
-} catch (IOException e) {
- throw new InvocationTargetException(e);
-}
-});
+ try {
+ saveLibraries(elements, file, charset, monitor);
+ } catch (IOException e) {
+ throw new InvocationTargetException(e);
+ }
+ });
fSettings.put(PREF_LASTPATH, file.getPath());
} catch (InvocationTargetException e) {
String errorTitle = PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_save_errordialog_title;
- String errorMessage = Messages
- .format(
- PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_save_errordialog_message,
- e.getMessage());
+ String errorMessage = Messages.format(
+ PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_save_errordialog_message,
+ e.getMessage());
ExceptionHandler.handle(e, getShell(), errorTitle,
errorMessage);
return;
@@ -534,10 +535,9 @@
if (nReplaced == 1) {
replaceMessage = PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_load_replace_message;
} else {
- replaceMessage = Messages
- .format(
- PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_load_replace_multiple_message,
- String.valueOf(nReplaced));
+ replaceMessage = Messages.format(
+ PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_load_replace_multiple_message,
+ String.valueOf(nReplaced));
}
if (!MessageDialog.openConfirm(getShell(), replaceTitle,
replaceMessage)) {
@@ -551,8 +551,8 @@
@Override
public boolean close() {
Point point = getShell().getSize();
- fSettings.put(PREF_USER_LIBRARY_LOADSAVE_SIZE, StringConverter
- .asString(point));
+ fSettings.put(PREF_USER_LIBRARY_LOADSAVE_SIZE,
+ StringConverter.asString(point));
return super.close();
}
@@ -561,37 +561,31 @@
fLastFile = null;
if (isSave()) {
if (name.length() == 0) {
- return new StatusInfo(
- IStatus.ERROR,
+ return new StatusInfo(IStatus.ERROR,
PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_location_error_save_enterlocation);
}
File file = new File(name);
if (file.isDirectory()) {
- return new StatusInfo(
- IStatus.ERROR,
+ return new StatusInfo(IStatus.ERROR,
PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_location_error_save_invalid);
}
if (fExportImportList.getCheckedSize() == 0) {
- return new StatusInfo(
- IStatus.ERROR,
+ return new StatusInfo(IStatus.ERROR,
PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_list_error_save_nothingselected);
}
fLastFile = file;
} else {
if (name.length() == 0) {
- return new StatusInfo(
- IStatus.ERROR,
+ return new StatusInfo(IStatus.ERROR,
PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_location_error_load_enterlocation);
}
if (!new File(name).isFile()) {
- return new StatusInfo(
- IStatus.ERROR,
+ return new StatusInfo(IStatus.ERROR,
PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_location_error_load_invalid);
}
if (fExportImportList.getSize() > 0
&& fExportImportList.getCheckedSize() == 0) {
- return new StatusInfo(
- IStatus.ERROR,
+ return new StatusInfo(IStatus.ERROR,
PreferencesMessages.UserLibraryPreferencePage_LoadSaveDialog_list_error_load_nothingselected);
}
}
@@ -623,8 +617,8 @@
BPUserLibraryElement curr = (BPUserLibraryElement) libraries
.get(i);
libraryElement.setAttribute(TAG_NAME, curr.getName());
- libraryElement.setAttribute(TAG_SYSTEMLIBRARY, String
- .valueOf(curr.isSystemLibrary()));
+ libraryElement.setAttribute(TAG_SYSTEMLIBRARY,
+ String.valueOf(curr.isSystemLibrary()));
BPListElement[] children = curr.getChildren();
for (int k = 0; k < children.length; k++) {
@@ -634,8 +628,8 @@
.createElement(TAG_ARCHIVE);
libraryElement.appendChild(childElement);
- childElement.setAttribute(TAG_ARCHIVE_PATH, child
- .getPath().toPortableString());
+ childElement.setAttribute(TAG_ARCHIVE_PATH,
+ child.getPath().toPortableString());
String nativeLibPath = (String) child
.getAttribute(BPListElement.NATIVE_LIB_PATH);
@@ -654,10 +648,10 @@
Element ruleElement = document
.createElement(TAG_ACCESSRULE);
rulesElement.appendChild(ruleElement);
- ruleElement.setAttribute(TAG_RULE_KIND, String
- .valueOf(rule.getKind()));
- ruleElement.setAttribute(TAG_RULE_PATTERN, rule
- .getPattern().toPortableString());
+ ruleElement.setAttribute(TAG_RULE_KIND,
+ String.valueOf(rule.getKind()));
+ ruleElement.setAttribute(TAG_RULE_PATTERN,
+ rule.getPattern().toPortableString());
}
}
}
@@ -729,12 +723,12 @@
}
Element libElement = (Element) lib;
String name = libElement.getAttribute(TAG_NAME);
- boolean isSystem = Boolean.valueOf(
- libElement.getAttribute(TAG_SYSTEMLIBRARY))
+ boolean isSystem = Boolean
+ .valueOf(libElement.getAttribute(TAG_SYSTEMLIBRARY))
.booleanValue();
- BPUserLibraryElement newLibrary = new BPUserLibraryElement(
- name, isSystem, null);
+ BPUserLibraryElement newLibrary = new BPUserLibraryElement(name,
+ isSystem, null);
result.add(newLibrary);
NodeList archiveList = libElement
@@ -748,9 +742,9 @@
String pathString = archiveElement
.getAttribute(TAG_ARCHIVE_PATH);
- IPath path = version.equals(VERSION1) ? Path
- .fromOSString(pathString) : Path
- .fromPortableString(pathString);
+ IPath path = version.equals(VERSION1)
+ ? Path.fromOSString(pathString)
+ : Path.fromPortableString(pathString);
path = path.makeAbsolute(); // only necessary for manually
// edited files: bug 202373
@@ -792,9 +786,9 @@
try {
int kind = Integer.parseInt(ruleElement
.getAttribute(TAG_RULE_KIND));
- IPath pattern = Path
- .fromPortableString(ruleElement
- .getAttribute(TAG_RULE_PATTERN));
+ IPath pattern = Path.fromPortableString(
+ ruleElement.getAttribute(
+ TAG_RULE_PATTERN));
resultingRules.add(DLTKCore
.newAccessRule(pattern, kind));
} catch (NumberFormatException e) {
@@ -802,12 +796,10 @@
}
}
}
- newArchive
- .setAttribute(
- BPListElement.ACCESSRULES,
- resultingRules
- .toArray(new IAccessRule[resultingRules
- .size()]));
+ newArchive.setAttribute(BPListElement.ACCESSRULES,
+ resultingRules.toArray(
+ new IAccessRule[resultingRules
+ .size()]));
}
}
}
@@ -848,7 +840,8 @@
// title only used when page is shown programatically
setTitle(PreferencesMessages.UserLibraryPreferencePage_title);
- setDescription(PreferencesMessages.UserLibraryPreferencePage_description);
+ setDescription(
+ PreferencesMessages.UserLibraryPreferencePage_description);
noDefaultAndApplyButton();
fDialogSettings = DLTKUIPlugin.getDefault().getDialogSettings();
@@ -871,12 +864,12 @@
* null
* ,
* "Detect"
- */};
+ */ };
fLibraryList = new TreeListDialogField(adapter, buttonLabels,
new BPListLabelProvider());
- fLibraryList
- .setLabelText(PreferencesMessages.UserLibraryPreferencePage_libraries_label);
+ fLibraryList.setLabelText(
+ PreferencesMessages.UserLibraryPreferencePage_libraries_label);
String[] names = DLTKCore.getUserLibraryNames(getLanguageToolkit());
ArrayList elements = new ArrayList();
@@ -886,8 +879,8 @@
.append(UserLibraryManager.makeLibraryName(names[i],
getLanguageToolkit()));
try {
- IBuildpathContainer container = DLTKCore.getBuildpathContainer(
- path, fDummyProject);
+ IBuildpathContainer container = DLTKCore
+ .getBuildpathContainer(path, fDummyProject);
elements.add(new BPUserLibraryElement(names[i], container,
fDummyProject));
} catch (ModelException e) {
@@ -896,7 +889,7 @@
}
}
fLibraryList.setElements(elements);
- fLibraryList.setViewerSorter(new BPListElementSorter());
+ fLibraryList.setViewerComparator(new BPListElementSorter());
doSelectionChanged(fLibraryList); // update button enable state
}
@@ -918,16 +911,16 @@
if (data instanceof Map) {
Map map = (Map) data;
Object selectedLibrary = map.get(DATA_LIBRARY_TO_SELECT);
- boolean createIfNotExists = Boolean.TRUE.equals(map
- .get(DATA_DO_CREATE));
+ boolean createIfNotExists = Boolean.TRUE
+ .equals(map.get(DATA_DO_CREATE));
if (selectedLibrary instanceof String) {
int nElements = fLibraryList.getSize();
for (int i = 0; i < nElements; i++) {
BPUserLibraryElement curr = (BPUserLibraryElement) fLibraryList
.getElement(i);
if (curr.getName().equals(selectedLibrary)) {
- fLibraryList.selectElements(new StructuredSelection(
- curr));
+ fLibraryList
+ .selectElements(new StructuredSelection(curr));
fLibraryList.expandElement(curr, 1);
break;
}
@@ -975,18 +968,18 @@
try {
PlatformUI.getWorkbench().getProgressService().run(true, true,
monitor -> {
-try {
- if (monitor != null) {
- monitor = new NullProgressMonitor();
- }
+ try {
+ if (monitor != null) {
+ monitor = new NullProgressMonitor();
+ }
- updateUserLibararies(monitor);
-} catch (CoreException e) {
- throw new InvocationTargetException(e);
-} finally {
- monitor.done();
-}
-});
+ updateUserLibararies(monitor);
+ } catch (CoreException e) {
+ throw new InvocationTargetException(e);
+ } finally {
+ monitor.done();
+ }
+ });
} catch (InterruptedException e) {
// cancelled by user
} catch (InvocationTargetException e) {
@@ -1000,8 +993,8 @@
private void updateUserLibararies(IProgressMonitor monitor)
throws CoreException {
List list = fLibraryList.getElements();
- HashSet oldNames = new HashSet(Arrays.asList(DLTKCore
- .getUserLibraryNames(getLanguageToolkit())));
+ HashSet oldNames = new HashSet(Arrays
+ .asList(DLTKCore.getUserLibraryNames(getLanguageToolkit())));
int nExisting = list.size();
HashSet newEntries = new HashSet(list.size());
@@ -1022,7 +1015,8 @@
null);
BuildpathContainerInitializer initializer = DLTKCore
- .getBuildpathContainerInitializer(DLTKCore.USER_LIBRARY_CONTAINER_ID);
+ .getBuildpathContainerInitializer(
+ DLTKCore.USER_LIBRARY_CONTAINER_ID);
if (initializer instanceof UserLibraryBuildpathContainerInitializer) {
((UserLibraryBuildpathContainerInitializer) initializer)
.setToolkit(getLanguageToolkit());
@@ -1032,9 +1026,8 @@
for (int i = 0; i < nExisting; i++) {
BPUserLibraryElement element = (BPUserLibraryElement) list.get(i);
IPath path = element.getPath();
- if (newEntries.contains(element)
- || element.hasChanges(DLTKCore.getBuildpathContainer(path,
- project), project)) {
+ if (newEntries.contains(element) || element.hasChanges(
+ DLTKCore.getBuildpathContainer(path, project), project)) {
IBuildpathContainer updatedContainer = element
.getUpdatedContainer();
try {
@@ -1054,8 +1047,8 @@
IPath path = new Path(DLTKCore.USER_LIBRARY_CONTAINER_ID)
.append(name);
try {
- initializer
- .requestBuildpathContainerUpdate(path, project, null);
+ initializer.requestBuildpathContainerUpdate(path, project,
+ null);
} catch (CoreException e) {
multiStatus.add(e.getStatus());
}
@@ -1082,8 +1075,8 @@
AccessRulesDialog dialog = new AccessRulesDialog(getShell(),
selElement, null, false);
if (dialog.open() == Window.OK) {
- selElement.setAttribute(BPListElement.ACCESSRULES, dialog
- .getAccessRules());
+ selElement.setAttribute(BPListElement.ACCESSRULES,
+ dialog.getAccessRules());
fLibraryList.refresh(elem);
fLibraryList.expandElement(elem, 2);
}
@@ -1171,11 +1164,11 @@
} else if (curr instanceof BPListElement) {
BPListElement elem = (BPListElement) curr;
if (((BPListElement) curr).isExternalFolder()) {
- editExternalElement(elem, (BPUserLibraryElement) elem
- .getParentContainer());
+ editExternalElement(elem,
+ (BPUserLibraryElement) elem.getParentContainer());
} else {
- editArchiveElement(elem, (BPUserLibraryElement) elem
- .getParentContainer());
+ editArchiveElement(elem,
+ (BPUserLibraryElement) elem.getParentContainer());
}
}
doSelectionChanged(fLibraryList);
@@ -1200,7 +1193,8 @@
private void editArchiveElement(BPListElement existingElement,
BPUserLibraryElement parent) {
- BPListElement[] elements = openExtZipFileDialog(existingElement, parent);
+ BPListElement[] elements = openExtZipFileDialog(existingElement,
+ parent);
if (elements != null) {
for (int i = 0; i < elements.length; i++) {
if (existingElement != null) {
@@ -1210,8 +1204,8 @@
}
}
fLibraryList.refresh(parent);
- fLibraryList.selectElements(new StructuredSelection(Arrays
- .asList(elements)));
+ fLibraryList.selectElements(
+ new StructuredSelection(Arrays.asList(elements)));
fLibraryList.expandElement(parent, 2);
}
}
@@ -1229,8 +1223,8 @@
}
}
fLibraryList.refresh(parent);
- fLibraryList.selectElements(new StructuredSelection(Arrays
- .asList(elements)));
+ fLibraryList.selectElements(
+ new StructuredSelection(Arrays.asList(elements)));
fLibraryList.expandElement(parent, 2);
}
}
@@ -1263,9 +1257,8 @@
BuildpathAttributeConfiguration config = fAttributeDescriptors
.get(attrib.getKey());
if (config != null) {
- IBuildpathAttribute result = config
- .performRemove(attrib
- .getBuildpathAttributeAccess());
+ IBuildpathAttribute result = config.performRemove(
+ attrib.getBuildpathAttributeAccess());
if (result != null) {
attrib.setValue(result.getValue());
fLibraryList.refresh(attrib);
@@ -1276,8 +1269,8 @@
}
if (fLibraryList.getSelectedElements().isEmpty()) {
if (selectionAfter != null) {
- fLibraryList.selectElements(new StructuredSelection(
- selectionAfter));
+ fLibraryList.selectElements(
+ new StructuredSelection(selectionAfter));
} else {
fLibraryList.selectFirstElement();
}
@@ -1379,9 +1372,8 @@
} else {
BuildpathAttributeConfiguration config = fAttributeDescriptors
.get(attrib.getKey());
- if (config == null
- || !config.canRemove(attrib
- .getBuildpathAttributeAccess())) {
+ if (config == null || !config
+ .canRemove(attrib.getBuildpathAttributeAccess())) {
return false;
}
}
@@ -1440,7 +1432,8 @@
BPUserLibraryElement parent = getCommonParent(list);
if (parent != null) {
BPListElement[] children = parent.getChildren();
- for (int i = 0, len = Math.min(list.size(), children.length); i < len; i++) {
+ for (int i = 0, len = Math.min(list.size(),
+ children.length); i < len; i++) {
if (!list.contains(children[i])) {
return true;
}
@@ -1453,8 +1446,8 @@
BPUserLibraryElement parent = getCommonParent(list);
if (parent != null) {
BPListElement[] children = parent.getChildren();
- for (int i = children.length - 1, end = Math.max(0, children.length
- - list.size()); i >= end; i--) {
+ for (int i = children.length - 1, end = Math.max(0,
+ children.length - list.size()); i >= end; i--) {
if (!list.contains(children[i])) {
return true;
}
@@ -1476,7 +1469,8 @@
lastUsedPath = ""; //$NON-NLS-1$
}
}
- String title = (existing == null) ? PreferencesMessages.UserLibraryPreferencePage_browsejar_new_title
+ String title = (existing == null)
+ ? PreferencesMessages.UserLibraryPreferencePage_browsejar_new_title
: PreferencesMessages.UserLibraryPreferencePage_browsejar_edit_title;
FileDialog dialog = new FileDialog(getShell(),
@@ -1508,14 +1502,14 @@
path = file.getFullPath();
}
- path = EnvironmentPathUtils.getFullPath(EnvironmentManager
- .getLocalEnvironment(), path);
+ path = EnvironmentPathUtils.getFullPath(
+ EnvironmentManager.getLocalEnvironment(), path);
BPListElement curr = new BPListElement(parent, null,
IBuildpathEntry.BPE_LIBRARY, path, file, true);
elems[i] = curr;
}
- fDialogSettings.put(IUIConstants.DIALOGSTORE_LASTEXTZIP, dialog
- .getFilterPath());
+ fDialogSettings.put(IUIConstants.DIALOGSTORE_LASTEXTZIP,
+ dialog.getFilterPath());
return elems;
}
@@ -1524,8 +1518,9 @@
Object parent) {
String lastUsedPath;
if (existing != null) {
- lastUsedPath = EnvironmentPathUtils.getLocalPath(
- existing.getPath().removeLastSegments(1)).toOSString();
+ lastUsedPath = EnvironmentPathUtils
+ .getLocalPath(existing.getPath().removeLastSegments(1))
+ .toOSString();
} else {
lastUsedPath = fDialogSettings
.get(IUIConstants.DIALOGSTORE_LASTEXTSOURCE);
@@ -1533,7 +1528,8 @@
lastUsedPath = ""; //$NON-NLS-1$
}
}
- String title = (existing == null) ? PreferencesMessages.UserLibraryPreferencePage_browseext_new_title
+ String title = (existing == null)
+ ? PreferencesMessages.UserLibraryPreferencePage_browseext_new_title
: PreferencesMessages.UserLibraryPreferencePage_browseext_edit_title;
DirectoryDialog dialog = new DirectoryDialog(getShell(),
@@ -1558,13 +1554,14 @@
IPath path = Path.fromOSString(res).makeAbsolute();
BPListElement curr = new BPListElement(parent, null,
- IBuildpathEntry.BPE_LIBRARY, EnvironmentPathUtils.getFullPath(
- EnvironmentManager.getLocalEnvironment(), path), null,
- true);
+ IBuildpathEntry.BPE_LIBRARY,
+ EnvironmentPathUtils.getFullPath(
+ EnvironmentManager.getLocalEnvironment(), path),
+ null, true);
elems[0] = curr;
- fDialogSettings.put(IUIConstants.DIALOGSTORE_LASTEXTSOURCE, dialog
- .getFilterPath());
+ fDialogSettings.put(IUIConstants.DIALOGSTORE_LASTEXTSOURCE,
+ dialog.getFilterPath());
return elems;
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/ScriptOutlineInformationControl.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/ScriptOutlineInformationControl.java
index b43dcb7..2731fb9 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/ScriptOutlineInformationControl.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/ScriptOutlineInformationControl.java
@@ -66,7 +66,8 @@
/**
* Show outline in light-weight control.
*/
-public class ScriptOutlineInformationControl extends AbstractInformationControl {
+public class ScriptOutlineInformationControl
+ extends AbstractInformationControl {
private KeyAdapter fKeyAdapter;
private OutlineContentProvider fOutlineContentProvider;
@@ -114,7 +115,8 @@
try {
IType type = getDefiningType(element);
if (type != null) {
- StringBuffer buf = new StringBuffer(super.getText(type));
+ StringBuffer buf = new StringBuffer(
+ super.getText(type));
buf.append(ScriptElementLabels.CONCAT_STRING);
buf.append(text);
return buf.toString();
@@ -198,7 +200,8 @@
if (i.getData() instanceof IModelElement) {
IModelElement je = (IModelElement) i.getData();
if (je.getElementType() == IModelElement.IMPORT_CONTAINER
- || (je.getElementType() == ModelElement.METHOD && !expandMethodChildren((IMethod) je))
+ || (je.getElementType() == ModelElement.METHOD
+ && !expandMethodChildren((IMethod) je))
|| isInnerType(je)) {
setExpanded(i, false);
return;
@@ -223,8 +226,8 @@
}
- private class OutlineContentProvider extends
- StandardModelElementContentProvider {
+ private class OutlineContentProvider
+ extends StandardModelElementContentProvider {
private boolean fShowInheritedMembers;
@@ -282,7 +285,8 @@
}
@Override
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ public void inputChanged(Viewer viewer, Object oldInput,
+ Object newInput) {
super.inputChanged(viewer, oldInput, newInput);
fTypeHierarchies.clear();
}
@@ -319,19 +323,20 @@
private TreeViewer fOutlineViewer;
private LexicalSortingAction(TreeViewer outlineViewer) {
- super(
- TextMessages.ScriptOutlineInformationControl_LexicalSortingAction_label,
+ super(TextMessages.ScriptOutlineInformationControl_LexicalSortingAction_label,
IAction.AS_CHECK_BOX);
- setToolTipText(TextMessages.ScriptOutlineInformationControl_LexicalSortingAction_tooltip);
- setDescription(TextMessages.ScriptOutlineInformationControl_LexicalSortingAction_description);
+ setToolTipText(
+ TextMessages.ScriptOutlineInformationControl_LexicalSortingAction_tooltip);
+ setDescription(
+ TextMessages.ScriptOutlineInformationControl_LexicalSortingAction_description);
DLTKPluginImages.setLocalImageDescriptors(this,
"alphab_sort_co.png"); //$NON-NLS-1$
fOutlineViewer = outlineViewer;
- boolean checked = getDialogSettings().getBoolean(
- STORE_LEXICAL_SORTING_CHECKED);
+ boolean checked = getDialogSettings()
+ .getBoolean(STORE_LEXICAL_SORTING_CHECKED);
setChecked(checked);
// PlatformUI.getWorkbench().getHelpSystem().setHelp(this,
// IJavaHelpContextIds.LEXICAL_SORTING_BROWSING_ACTION);
@@ -368,10 +373,11 @@
* the outline viewer
*/
private SortByDefiningTypeAction(TreeViewer outlineViewer) {
- super(
- TextMessages.ScriptOutlineInformationControl_SortByDefiningTypeAction_label);
- setDescription(TextMessages.ScriptOutlineInformationControl_SortByDefiningTypeAction_description);
- setToolTipText(TextMessages.ScriptOutlineInformationControl_SortByDefiningTypeAction_tooltip);
+ super(TextMessages.ScriptOutlineInformationControl_SortByDefiningTypeAction_label);
+ setDescription(
+ TextMessages.ScriptOutlineInformationControl_SortByDefiningTypeAction_description);
+ setToolTipText(
+ TextMessages.ScriptOutlineInformationControl_SortByDefiningTypeAction_tooltip);
DLTKPluginImages.setLocalImageDescriptors(this,
"definingtype_sort_co.png"); //$NON-NLS-1$
@@ -384,8 +390,8 @@
System.err.println("TODO: add help support here"); //$NON-NLS-1$
}
- boolean state = getDialogSettings().getBoolean(
- STORE_SORT_BY_DEFINING_TYPE_CHECKED);
+ boolean state = getDialogSettings()
+ .getBoolean(STORE_SORT_BY_DEFINING_TYPE_CHECKED);
setChecked(state);
fInnerLabelProvider.setShowDefiningType(state);
}
@@ -394,8 +400,7 @@
public void run() {
BusyIndicator.showWhile(fOutlineViewer.getControl().getDisplay(),
() -> {
- fInnerLabelProvider
- .setShowDefiningType(isChecked());
+ fInnerLabelProvider.setShowDefiningType(isChecked());
getDialogSettings().put(
STORE_SORT_BY_DEFINING_TYPE_CHECKED,
isChecked());
@@ -444,8 +449,8 @@
@Deprecated
public ScriptOutlineInformationControl(Shell parent, int shellStyle,
int treeStyle, String commandId) {
- this(parent, shellStyle, treeStyle, commandId, DLTKUIPlugin
- .getDefault().getPreferenceStore());
+ this(parent, shellStyle, treeStyle, commandId,
+ DLTKUIPlugin.getDefault().getPreferenceStore());
}
/**
@@ -493,8 +498,8 @@
treeViewer.addFilter(new NamePatternFilter());
treeViewer.addFilter(new MemberFilter());
- fForegroundColor = parent.getDisplay().getSystemColor(
- SWT.COLOR_DARK_GRAY);
+ fForegroundColor = parent.getDisplay()
+ .getSystemColor(SWT.COLOR_DARK_GRAY);
fInnerLabelProvider = new OutlineLabelProvider();
fInnerLabelProvider.addLabelDecorator(new ProblemsLabelDecorator(null));
@@ -507,8 +512,8 @@
* OverrideIndicatorLabelDecorator(null));
*/
- treeViewer.setLabelProvider(new StyledDecoratingModelLabelProvider(
- fInnerLabelProvider));
+ treeViewer.setLabelProvider(
+ new StyledDecoratingModelLabelProvider(fInnerLabelProvider));
fLexicalSortingAction = new LexicalSortingAction(treeViewer);
fSortByDefiningTypeAction = new SortByDefiningTypeAction(treeViewer);
@@ -519,7 +524,7 @@
fOutlineContentProvider = new OutlineContentProvider(false);
treeViewer.setContentProvider(fOutlineContentProvider);
fOutlineSorter = new OutlineSorter();
- treeViewer.setSorter(fOutlineSorter);
+ treeViewer.setComparator(fOutlineSorter);
treeViewer.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
treeViewer.getTree().addKeyListener(getKeyAdapter());
@@ -536,13 +541,13 @@
String keySequence = sequences[0].format();
if (fOutlineContentProvider.isShowingInheritedMembers())
- return Messages
- .format(TextMessages.ScriptOutlineInformationControl_pressToHideInheritedMembers,
- keySequence);
+ return Messages.format(
+ TextMessages.ScriptOutlineInformationControl_pressToHideInheritedMembers,
+ keySequence);
else
- return Messages
- .format(TextMessages.ScriptOutlineInformationControl_pressToShowInheritedMembers,
- keySequence);
+ return Messages.format(
+ TextMessages.ScriptOutlineInformationControl_pressToShowInheritedMembers,
+ keySequence);
}
@Override
@@ -574,9 +579,9 @@
public void keyPressed(KeyEvent e) {
int accelerator = SWTKeySupport
.convertEventToUnmodifiedAccelerator(e);
- KeySequence keySequence = KeySequence
- .getInstance(SWTKeySupport
- .convertAcceleratorToKeyStroke(accelerator));
+ KeySequence keySequence = KeySequence.getInstance(
+ SWTKeySupport.convertAcceleratorToKeyStroke(
+ accelerator));
KeySequence[] sequences = getInvokingCommandKeySequences();
if (sequences == null)
return;
diff --git a/core/plugins/org.eclipse.dltk.ui/ui refactoring/org/eclipse/dltk/internal/ui/refactoring/reorg/ReorgUserInputPage.java b/core/plugins/org.eclipse.dltk.ui/ui refactoring/org/eclipse/dltk/internal/ui/refactoring/reorg/ReorgUserInputPage.java
index fd37be5..07a52f8 100644
--- a/core/plugins/org.eclipse.dltk.ui/ui refactoring/org/eclipse/dltk/internal/ui/refactoring/reorg/ReorgUserInputPage.java
+++ b/core/plugins/org.eclipse.dltk.ui/ui refactoring/org/eclipse/dltk/internal/ui/refactoring/reorg/ReorgUserInputPage.java
@@ -34,14 +34,13 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
-
-
-abstract class ReorgUserInputPage extends UserInputWizardPage{
- private static final long LABEL_FLAGS= ScriptElementLabels.ALL_DEFAULT
+abstract class ReorgUserInputPage extends UserInputWizardPage {
+ private static final long LABEL_FLAGS = ScriptElementLabels.ALL_DEFAULT
| ScriptElementLabels.M_APP_RETURNTYPE
| ScriptElementLabels.M_PARAMETER_NAMES
| ScriptElementLabels.F_PRE_TYPE_SIGNATURE;
private TreeViewer fViewer;
+
public ReorgUserInputPage(String pageName) {
super(pageName);
}
@@ -49,37 +48,39 @@
@Override
public void createControl(Composite parent) {
initializeDialogUnits(parent);
- Composite result= new Composite(parent, SWT.NONE);
+ Composite result = new Composite(parent, SWT.NONE);
setControl(result);
result.setLayout(new GridLayout());
- Object initialSelection= getInitiallySelectedElement();
+ Object initialSelection = getInitiallySelectedElement();
verifyDestination(initialSelection, true);
addLabel(result);
- fViewer= createViewer(result);
+ fViewer = createViewer(result);
fViewer.setSelection(new StructuredSelection(initialSelection), true);
- fViewer.addSelectionChangedListener(event -> ReorgUserInputPage.this.viewerSelectionChanged(event));
+ fViewer.addSelectionChangedListener(
+ event -> ReorgUserInputPage.this.viewerSelectionChanged(event));
Dialog.applyDialogFont(result);
}
protected Control addLabel(Composite parent) {
- Label label= new Label(parent, SWT.NONE);
+ Label label = new Label(parent, SWT.NONE);
String text;
- int resources= getResources().length;
- int modelElements= getScriptElements().length;
+ int resources = getResources().length;
+ int modelElements = getScriptElements().length;
if (resources == 0 && modelElements == 1) {
- text= Messages.format(
+ text = Messages.format(
ReorgMessages.ReorgUserInputPage_choose_destination_single,
- ScriptElementLabels.getDefault().getElementLabel(getScriptElements()[0], LABEL_FLAGS));
+ ScriptElementLabels.getDefault().getElementLabel(
+ getScriptElements()[0], LABEL_FLAGS));
} else if (resources == 1 && modelElements == 0) {
- text= Messages.format(
+ text = Messages.format(
ReorgMessages.ReorgUserInputPage_choose_destination_single,
getResources()[0].getName());
} else {
- text= Messages.format(
+ text = Messages.format(
ReorgMessages.ReorgUserInputPage_choose_destination_multi,
String.valueOf(resources + modelElements));
}
@@ -90,26 +91,29 @@
}
private void viewerSelectionChanged(SelectionChangedEvent event) {
- ISelection selection= event.getSelection();
+ ISelection selection = event.getSelection();
if (!(selection instanceof IStructuredSelection))
return;
- IStructuredSelection ss= (IStructuredSelection)selection;
+ IStructuredSelection ss = (IStructuredSelection) selection;
verifyDestination(ss.getFirstElement(), false);
}
protected abstract Object getInitiallySelectedElement();
/** Set and verify destination */
- protected abstract RefactoringStatus verifyDestination(Object selected) throws ModelException;
+ protected abstract RefactoringStatus verifyDestination(Object selected)
+ throws ModelException;
protected abstract IResource[] getResources();
+
protected abstract IModelElement[] getScriptElements();
protected abstract IReorgDestinationValidator getDestinationValidator();
- private final void verifyDestination(Object selected, boolean initialVerification) {
+ private final void verifyDestination(Object selected,
+ boolean initialVerification) {
try {
- RefactoringStatus status= verifyDestination(selected);
+ RefactoringStatus status = verifyDestination(selected);
if (initialVerification)
setPageComplete(status.isOK());
else
@@ -121,15 +125,19 @@
}
private TreeViewer createViewer(Composite parent) {
- TreeViewer treeViewer= new TreeViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- GridData gd= new GridData(GridData.FILL_BOTH);
- gd.widthHint= convertWidthInCharsToPixels(40);
- gd.heightHint= convertHeightInCharsToPixels(15);
+ TreeViewer treeViewer = new TreeViewer(parent,
+ SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+ GridData gd = new GridData(GridData.FILL_BOTH);
+ gd.widthHint = convertWidthInCharsToPixels(40);
+ gd.heightHint = convertHeightInCharsToPixels(15);
treeViewer.getTree().setLayoutData(gd);
- treeViewer.setLabelProvider(new ModelElementLabelProvider(ModelElementLabelProvider.SHOW_SMALL_ICONS));
- treeViewer.setContentProvider(new DestinationContentProvider(getDestinationValidator()));
- treeViewer.setSorter(new ModelElementSorter());
- treeViewer.setInput(DLTKCore.create(ResourcesPlugin.getWorkspace().getRoot()));
+ treeViewer.setLabelProvider(new ModelElementLabelProvider(
+ ModelElementLabelProvider.SHOW_SMALL_ICONS));
+ treeViewer.setContentProvider(
+ new DestinationContentProvider(getDestinationValidator()));
+ treeViewer.setComparator(new ModelElementSorter());
+ treeViewer.setInput(
+ DLTKCore.create(ResourcesPlugin.getWorkspace().getRoot()));
return treeViewer;
}
diff --git a/core/plugins/org.eclipse.dltk.validators.externalchecker/src/org/eclipse/dltk/validators/internal/externalchecker/ui/ExternalCheckerGenericHyperlink.java b/core/plugins/org.eclipse.dltk.validators.externalchecker/src/org/eclipse/dltk/validators/internal/externalchecker/ui/ExternalCheckerGenericHyperlink.java
index 12dbd30..fb2ede9 100644
--- a/core/plugins/org.eclipse.dltk.validators.externalchecker/src/org/eclipse/dltk/validators/internal/externalchecker/ui/ExternalCheckerGenericHyperlink.java
+++ b/core/plugins/org.eclipse.dltk.validators.externalchecker/src/org/eclipse/dltk/validators/internal/externalchecker/ui/ExternalCheckerGenericHyperlink.java
@@ -110,7 +110,7 @@
public String getEditorId(IEditorInput input, Object inputObject) {
try {
- IEditorDescriptor descriptor = IDE.getEditorDescriptor(input.getName());
+ IEditorDescriptor descriptor = IDE.getEditorDescriptor(input.getName(), true, false);
return descriptor.getId();
} catch (PartInitException e) {
return null;
diff --git a/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/ValidatorBlock.java b/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/ValidatorBlock.java
index 3210b9a..96455bc 100644
--- a/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/ValidatorBlock.java
+++ b/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/ValidatorBlock.java
@@ -30,7 +30,7 @@
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyAdapter;
@@ -299,7 +299,7 @@
* Sorts by Interpreter type, and name within type.
*/
private void sortByType() {
- fValidatorList.setSorter(new ViewerSorter() {
+ fValidatorList.setComparator(new ViewerComparator() {
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
if ((e1 instanceof IValidator) && (e2 instanceof IValidator)) {
@@ -328,7 +328,7 @@
* Sorts by Interpreter name.
*/
private void sortByName() {
- fValidatorList.setSorter(new ViewerSorter() {
+ fValidatorList.setComparator(new ViewerComparator() {
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
if ((e1 instanceof IValidator) && (e2 instanceof IValidator)) {
