diff options
Diffstat (limited to 'core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal')
51 files changed, 458 insertions, 626 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java index 35d40434ce2..8e9aeb2e187 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java @@ -12,16 +12,13 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.Arrays; -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.util.SelectionUtil; -import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; @@ -31,6 +28,11 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; +import org.eclipse.cdt.ui.CUIPlugin; + +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; + /** */ public class CPathContainerSelectionPage extends WizardPage { @@ -128,7 +130,11 @@ public class CPathContainerSelectionPage extends WizardPage { public IContainerDescriptor getSelected() { if (fListViewer != null) { ISelection selection= fListViewer.getSelection(); - return (IContainerDescriptor) SelectionUtil.getSingleElement(selection); + if (selection instanceof IStructuredSelection) { + IStructuredSelection ss = (IStructuredSelection) selection; + if (ss.size() == 1) + return (IContainerDescriptor) ss.getFirstElement(); + } } return null; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java index 37139d2e6d9..667e33e8bad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java @@ -14,18 +14,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IContainerEntry; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.core.model.IProjectEntry; -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.util.SelectionUtil; -import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; -import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; @@ -39,6 +30,17 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.model.WorkbenchLabelProvider; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IContainerEntry; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.core.model.IProjectEntry; +import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; + +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; + public class ProjectContainerPage extends WizardPage implements IPathEntryContainerPage { private int[] fFilterType; @@ -69,9 +71,12 @@ public class ProjectContainerPage extends WizardPage implements IPathEntryContai IProjectEntry getProjectEntry() { if (viewer != null) { ISelection selection = viewer.getSelection(); - ICProject project = (ICProject)SelectionUtil.getSingleElement(selection); - if (project != null) { - return CoreModel.newProjectEntry(project.getPath()); + if (selection instanceof IStructuredSelection) { + IStructuredSelection ss = (IStructuredSelection) selection; + if (ss.size() == 1) { + ICProject project = (ICProject) ss.getFirstElement(); + return CoreModel.newProjectEntry(project.getPath()); + } } } return null; @@ -124,8 +129,8 @@ public class ProjectContainerPage extends WizardPage implements IPathEntryContai } private void initializeView() { - List list = new ArrayList(); - List current; + List<ICProject> list = new ArrayList<ICProject>(); + List<IPathEntry> current; try { current = Arrays.asList(fCProject.getRawPathEntries()); ICProject[] cProjects = CoreModel.getDefault().getCModel().getCProjects(); @@ -133,9 +138,9 @@ public class ProjectContainerPage extends WizardPage implements IPathEntryContai boolean added = false; if (!cProjects[i].equals(fCProject) && !current.contains(CoreModel.newProjectEntry(cProjects[i].getPath()))) { IPathEntry[] projEntries = cProjects[i].getRawPathEntries(); - for (int j = 0; j < projEntries.length; j++) { - for (int k = 0; k < fFilterType.length; k++) { - if (projEntries[j].getEntryKind() == fFilterType[k] && projEntries[j].isExported()) { + for (IPathEntry projEntrie : projEntries) { + for (int element : fFilterType) { + if (projEntrie.getEntryKind() == element && projEntrie.isExported()) { list.add(cProjects[i]); added = true; break; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java index c821afc0632..77e598a00ce 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java @@ -65,7 +65,7 @@ public class CustomFiltersDialog extends SelectionDialog { Button fEnableUserDefinedPatterns; Text fUserDefinedPatterns; - Stack<Object> fFilterDescriptorChangeHistory; + Stack<FilterDescriptor> fFilterDescriptorChangeHistory; /** @@ -91,7 +91,7 @@ public class CustomFiltersDialog extends SelectionDialog { fEnabledFilterIds= enabledFilterIds; fBuiltInFilters= FilterDescriptor.getFilterDescriptors(fViewId); - fFilterDescriptorChangeHistory= new Stack<Object>(); + fFilterDescriptorChangeHistory= new Stack<FilterDescriptor>(); setShellStyle(getShellStyle() | SWT.RESIZE); } @@ -212,7 +212,7 @@ public class CustomFiltersDialog extends SelectionDialog { if (fFilterDescriptorChangeHistory.contains(element)) { fFilterDescriptorChangeHistory.remove(element); } - fFilterDescriptorChangeHistory.push(element); + fFilterDescriptorChangeHistory.push((FilterDescriptor)element); } }}); @@ -237,8 +237,8 @@ public class CustomFiltersDialog extends SelectionDialog { public void widgetSelected(SelectionEvent e) { fCheckBoxList.setAllChecked(true); fFilterDescriptorChangeHistory.clear(); - for (int i= 0; i < fBuiltInFilters.length; i++) { - fFilterDescriptorChangeHistory.push(fBuiltInFilters[i]); + for (FilterDescriptor builtInFilter : fBuiltInFilters) { + fFilterDescriptorChangeHistory.push(builtInFilter); } } }; @@ -253,8 +253,8 @@ public class CustomFiltersDialog extends SelectionDialog { public void widgetSelected(SelectionEvent e) { fCheckBoxList.setAllChecked(false); fFilterDescriptorChangeHistory.clear(); - for (int i= 0; i < fBuiltInFilters.length; i++) - fFilterDescriptorChangeHistory.push(fBuiltInFilters[i]); + for (FilterDescriptor builtInFilter : fBuiltInFilters) + fFilterDescriptorChangeHistory.push(builtInFilter); } }; deselectButton.addSelectionListener(listener); @@ -324,8 +324,8 @@ public class CustomFiltersDialog extends SelectionDialog { public String[] getEnabledFilterIds() { Object[] result= getResult(); Set<String> enabledIds= new HashSet<String>(result.length); - for (int i= 0; i < result.length; i++) - enabledIds.add(((FilterDescriptor)result[i]).getId()); + for (Object element : result) + enabledIds.add(((FilterDescriptor)element).getId()); return enabledIds.toArray(new String[enabledIds.size()]); } @@ -340,7 +340,7 @@ public class CustomFiltersDialog extends SelectionDialog { * @return a stack with the filter descriptor check history * @since 3.0 */ - public Stack<Object> getFilterDescriptorChangeHistory() { + public Stack<FilterDescriptor> getFilterDescriptorChangeHistory() { return fFilterDescriptorChangeHistory; } @@ -348,10 +348,10 @@ public class CustomFiltersDialog extends SelectionDialog { FilterDescriptor[] filterDescs= fBuiltInFilters; List<FilterDescriptor> result= new ArrayList<FilterDescriptor>(filterDescs.length); List<String> enabledFilterIds= Arrays.asList(fEnabledFilterIds); - for (int i= 0; i < filterDescs.length; i++) { - String id= filterDescs[i].getId(); + for (FilterDescriptor filterDesc : filterDescs) { + String id= filterDesc.getId(); if (enabledFilterIds.contains(id)) - result.add(filterDescs[i]); + result.add(filterDesc); } return result.toArray(new FilterDescriptor[result.size()]); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java index 65a5c3ac99e..ce9dca04795 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java @@ -70,7 +70,7 @@ public class CHelpDisplayContext implements IContext { public CHelpDisplayContext(IContext context, final ITextEditor editor , String selected) throws CoreException { - List helpResources= new ArrayList(); + List<IHelpResource> helpResources= new ArrayList<IHelpResource>(); ICHelpInvocationContext invocationContext = new ICHelpInvocationContext() { @@ -102,7 +102,7 @@ public class CHelpDisplayContext implements IContext { } } - fHelpResources= (IHelpResource[]) helpResources.toArray(new IHelpResource[helpResources.size()]); + fHelpResources= helpResources.toArray(new IHelpResource[helpResources.size()]); if (fText == null || fText.length() == 0) { if (context != null) { fText= context.getText(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java index e2dea59cff8..9b15256a136 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.cdt.core.model.ICModelMarker; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -25,6 +24,8 @@ import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.actions.ActionDelegate; +import org.eclipse.cdt.core.model.ICModelMarker; + /** * @author Bogdan Gheorghe */ @@ -43,9 +44,9 @@ public class DeleteIProblemMarkerAction extends ActionDelegate implements IObjec return; } try { - List list = selection.toList(); - List listMarkers = new ArrayList(); - Iterator iterator = list.iterator(); + List<?> list = selection.toList(); + List<IMarker> listMarkers = new ArrayList<IMarker>(); + Iterator<?> iterator = list.iterator(); while (iterator.hasNext()) { IMarker marker = (IMarker)iterator.next(); if (marker.isSubtypeOf(ICModelMarker.INDEXER_MARKER)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java index 858517bf4c2..c9b0a70c678 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java @@ -42,9 +42,9 @@ public class DeleteTaskAction extends ActionDelegate implements IObjectActionDel return; } try { - List list = selection.toList(); - List listMarkers = new ArrayList(); - Iterator iterator = list.iterator(); + List<?> list = selection.toList(); + List<IMarker> listMarkers = new ArrayList<IMarker>(); + Iterator<?> iterator = list.iterator(); while (iterator.hasNext()) { IMarker marker = (IMarker)iterator.next(); if (marker.isSubtypeOf(ICModelMarker.C_MODEL_PROBLEM_MARKER) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java index e8caed9b255..dfcd8b81d44 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java @@ -157,35 +157,35 @@ public class EditorUtility { } private static IEditorPart openInEditor(IFile file, boolean activate) throws PartInitException { - if (!file.getProject().isAccessible()){ + if (file == null) + return null; + if (!file.getProject().isAccessible()) { closedProject(file.getProject()); return null; } - if (file != null) { try { - if (!isLinked(file)) { - File tempFile = file.getRawLocation().toFile(); - - if (tempFile != null){ - String canonicalPath = null; - try { - canonicalPath = tempFile.getCanonicalPath(); - } catch (IOException e1) {} - - if (canonicalPath != null){ - IPath path = new Path(canonicalPath); - file = CUIPlugin.getWorkspace().getRoot().getFileForLocation(path); - } + if (!isLinked(file)) { + File tempFile = file.getRawLocation().toFile(); + + if (tempFile != null){ + String canonicalPath = null; + try { + canonicalPath = tempFile.getCanonicalPath(); + } catch (IOException e1) {} + + if (canonicalPath != null){ + IPath path = new Path(canonicalPath); + file = CUIPlugin.getWorkspace().getRoot().getFileForLocation(path); } } + } - IEditorInput input = getEditorInput(file); - if (input != null) { - return openInEditor(input, getEditorID(input, file), activate); - } - } catch (CModelException e) {} - } + IEditorInput input = getEditorInput(file); + if (input != null) { + return openInEditor(input, getEditorID(input, file), activate); + } + } catch (CModelException e) {} return null; } @@ -199,8 +199,8 @@ public class EditorUtility { path = path.removeLastSegments(1); IContainer[] containers = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocation(path); - for(int i=0; i<containers.length; i++) { - if (containers[i] instanceof IFolder && ((IFolder)containers[i]).isLinked()) { + for (IContainer container : containers) { + if (container instanceof IFolder && ((IFolder)container).isLinked()) { return true; } } @@ -438,8 +438,7 @@ public class EditorUtility { IFile secondBestMatch= null; IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot(); IFile[] files= root.findFilesForLocation(location); - for (int i= 0; i < files.length; i++) { - IFile file= files[i]; + for (IFile file : files) { if (file.isAccessible()) { if (project != null && file.getProject().equals(project)) { bestMatch= file; @@ -490,8 +489,7 @@ public class EditorUtility { IFile secondBestMatch= null; IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot(); IFile[] files= root.findFilesForLocationURI(locationURI); - for (int i= 0; i < files.length; i++) { - IFile file= files[i]; + for (IFile file : files) { if (file.isAccessible()) { if (project != null && file.getProject().equals(project)) { bestMatch= file; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java index c0a9ce4171a..a85bab9f0ac 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java @@ -67,6 +67,7 @@ public class ExternalEditorInput implements ITranslationUnitEditorInput, IPersis /* * @see IAdaptable#getAdapter(Class) */ + @SuppressWarnings("unchecked") public Object getAdapter(Class adapter) { if (ILocationProvider.class.equals(adapter)) { return this; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ImageDescriptorRegistry.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ImageDescriptorRegistry.java index ed7b6da5d41..6ff479f870d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ImageDescriptorRegistry.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ImageDescriptorRegistry.java @@ -25,7 +25,7 @@ import org.eclipse.core.runtime.Assert; */ public class ImageDescriptorRegistry { - private HashMap fRegistry= new HashMap(10); + private HashMap<ImageDescriptor, Image> fRegistry= new HashMap<ImageDescriptor, Image>(10); private Display fDisplay; /** @@ -59,7 +59,7 @@ public class ImageDescriptorRegistry { if (descriptor == null) descriptor= ImageDescriptor.getMissingImageDescriptor(); - Image result= (Image)fRegistry.get(descriptor); + Image result= fRegistry.get(descriptor); if (result != null) return result; @@ -74,8 +74,8 @@ public class ImageDescriptorRegistry { * Disposes all images managed by this registry. */ public void dispose() { - for (Iterator iter= fRegistry.values().iterator(); iter.hasNext(); ) { - Image image= (Image)iter.next(); + for (Iterator<Image> iter= fRegistry.values().iterator(); iter.hasNext(); ) { + Image image= iter.next(); image.dispose(); } fRegistry.clear(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/PendingUpdateAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/PendingUpdateAdapter.java index 629cd1f1490..a22cc4df8be 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/PendingUpdateAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/PendingUpdateAdapter.java @@ -48,7 +48,8 @@ public class PendingUpdateAdapter implements IWorkbenchAdapter, IAdaptable { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + @SuppressWarnings("unchecked") + public Object getAdapter(Class adapter) { if (adapter == IWorkbenchAdapter.class) return this; return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java index 39eed853c6b..43f847188e2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java @@ -45,9 +45,9 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio */ private static class ProjectErrorVisitor implements IResourceDeltaVisitor { - private HashSet fChangedElements; + private HashSet<IResource> fChangedElements; - public ProjectErrorVisitor(HashSet changedElements) { + public ProjectErrorVisitor(HashSet<IResource> changedElements) { fChangedElements = changedElements; } @@ -78,13 +78,13 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio private boolean isErrorDelta(IResourceDelta delta) { if ( (delta.getFlags() & IResourceDelta.MARKERS) != 0) { IMarkerDelta[] markerDeltas = delta.getMarkerDeltas(); - for (int i = 0; i < markerDeltas.length; i++) { - if (markerDeltas[i].isSubtypeOf(IMarker.PROBLEM)) { - int kind = markerDeltas[i].getKind(); + for (IMarkerDelta markerDelta : markerDeltas) { + if (markerDelta.isSubtypeOf(IMarker.PROBLEM)) { + int kind = markerDelta.getKind(); if (kind == IResourceDelta.ADDED || kind == IResourceDelta.REMOVED) return true; - int severity = markerDeltas[i].getAttribute(IMarker.SEVERITY, -1); - int newSeverity = markerDeltas[i].getMarker().getAttribute(IMarker.SEVERITY, -1); + int severity = markerDelta.getAttribute(IMarker.SEVERITY, -1); + int newSeverity = markerDelta.getMarker().getAttribute(IMarker.SEVERITY, -1); if (newSeverity != severity) return true; } @@ -104,7 +104,7 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio * @see IResourceChangeListener#resourceChanged */ public void resourceChanged(IResourceChangeEvent event) { - HashSet changedElements = new HashSet(); + HashSet<IResource> changedElements = new HashSet<IResource>(); try { IResourceDelta delta = event.getDelta(); @@ -115,7 +115,7 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio } if (!changedElements.isEmpty()) { - IResource[] changes = (IResource[])changedElements.toArray(new IResource[changedElements.size()]); + IResource[] changes = changedElements.toArray(new IResource[changedElements.size()]); fireChanges(changes, true); } @@ -178,8 +178,8 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio public void run() { Object[] listeners = fListeners.getListeners(); - for (int i = 0; i < listeners.length; i++) { - IProblemChangedListener curr = (IProblemChangedListener)listeners[i]; + for (Object listener : listeners) { + IProblemChangedListener curr = (IProblemChangedListener)listener; curr.problemsChanged(changes, markerChanged); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java index bad84d1c661..1617c6c487b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java @@ -111,7 +111,7 @@ public class ProblemTableViewer extends TableViewer { Object[] changed= event.getElements(); if (changed != null && !fResourceToItemsMapper.isEmpty()) { - ArrayList others= new ArrayList(changed.length); + ArrayList<Object> others= new ArrayList<Object>(changed.length); for (int i= 0; i < changed.length; i++) { Object curr= changed[i]; if (curr instanceof IResource) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java index c78ea67ae2e..345ce827487 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java @@ -109,7 +109,7 @@ public class ProblemTreeViewer extends TreeViewer { } Object[] changed= event.getElements(); if (changed != null && !fResourceToItemsMapper.isEmpty()) { - ArrayList others= new ArrayList(changed.length); + ArrayList<Object> others= new ArrayList<Object>(changed.length); for (int i= 0; i < changed.length; i++) { Object curr= changed[i]; if (curr instanceof IResource) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeContentManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeContentManager.java index fc967ce74a1..72042d5c4dc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeContentManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeContentManager.java @@ -49,9 +49,9 @@ public class RemoteTreeContentManager { * Queue of parents to fetch children for, and * associated element collectors and deferred adapters. */ - private List fElementQueue = new ArrayList(); - private List fCollectors = new ArrayList(); - private List fAdapaters = new ArrayList(); + private List<Object> fElementQueue = new ArrayList<Object>(); + private List<IElementCollector> fCollectors = new ArrayList<IElementCollector>(); + private List<IDeferredWorkbenchAdapter> fAdapaters = new ArrayList<IDeferredWorkbenchAdapter>(); /** * Fetching children is done in a single background job. @@ -79,8 +79,8 @@ public class RemoteTreeContentManager { return Status.CANCEL_STATUS; } element = fElementQueue.remove(0); - collector = (IElementCollector) fCollectors.remove(0); - adapter = (IDeferredWorkbenchAdapter) fAdapaters.remove(0); + collector = fCollectors.remove(0); + adapter = fAdapaters.remove(0); } adapter.fetchDeferredChildren(element, collector, monitor); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java index 661a06d98be..8b398bd5df0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java @@ -40,7 +40,7 @@ public class RemoteTreeViewer extends ProblemTreeViewer { class ExpansionJob extends UIJob { private Object element; - private List parents = new ArrayList(); // top down + private List<Object> parents = new ArrayList<Object>(); // top down /** * Constucts a job to expand the given element. @@ -62,7 +62,7 @@ public class RemoteTreeViewer extends ProblemTreeViewer { } synchronized (RemoteTreeViewer.this) { boolean allParentsExpanded = true; - Iterator iterator = parents.iterator(); + Iterator<Object> iterator = parents.iterator(); while (iterator.hasNext() && !monitor.isCanceled()) { Object parent = iterator.next(); Widget item = findItem(parent); @@ -109,7 +109,7 @@ public class RemoteTreeViewer extends ProblemTreeViewer { private IStructuredSelection selection; private Object first; - private List parents = new ArrayList(); // top down + private List<Object> parents = new ArrayList<Object>(); // top down /** * Constucts a job to select the given element. @@ -131,7 +131,7 @@ public class RemoteTreeViewer extends ProblemTreeViewer { } synchronized (RemoteTreeViewer.this) { boolean allParentsExpanded = true; - Iterator iterator = parents.iterator(); + Iterator<Object> iterator = parents.iterator(); while (iterator.hasNext() && !monitor.isCanceled()) { Object parent = iterator.next(); Widget item = findItem(parent); @@ -327,7 +327,7 @@ public class RemoteTreeViewer extends ProblemTreeViewer { } } - private void addAllParents(List list, Object element) { + private void addAllParents(List<Object> list, Object element) { if (element instanceof IAdaptable) { IAdaptable adaptable = (IAdaptable) element; IWorkbenchAdapter adapter = (IWorkbenchAdapter) adaptable.getAdapter(IWorkbenchAdapter.class); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ResourceToItemsMapper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ResourceToItemsMapper.java index cb7074fa5f3..b0ac5334b63 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ResourceToItemsMapper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ResourceToItemsMapper.java @@ -15,17 +15,16 @@ import java.util.HashMap; import java.util.List; import java.util.Stack; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.core.resources.IResource; - -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Item; - import org.eclipse.jface.viewers.ContentViewer; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.IViewerLabelProvider; import org.eclipse.jface.viewers.ViewerLabel; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Item; + +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ITranslationUnit; /** * Helper class for updating error markers and other decorators that work on resources. @@ -38,14 +37,14 @@ public class ResourceToItemsMapper { private static final int NUMBER_LIST_REUSE= 10; // map from resource to item - private HashMap fResourceToItem; - private Stack fReuseLists; + private HashMap<IResource, Object> fResourceToItem; + private Stack<List<Item>> fReuseLists; private ContentViewer fContentViewer; public ResourceToItemsMapper(ContentViewer viewer) { - fResourceToItem= new HashMap(); - fReuseLists= new Stack(); + fResourceToItem= new HashMap<IResource, Object>(); + fReuseLists= new Stack<List<Item>>(); fContentViewer= viewer; } @@ -60,9 +59,10 @@ public class ResourceToItemsMapper { } else if (obj instanceof Item) { updateItem((Item) obj); } else { // List of Items - List list= (List) obj; + @SuppressWarnings("unchecked") + List<Item> list= (List<Item>) obj; for (int k= 0; k < list.size(); k++) { - updateItem((Item) list.get(k)); + updateItem(list.get(k)); } } } @@ -114,13 +114,14 @@ public class ResourceToItemsMapper { fResourceToItem.put(resource, item); } else if (existingMapping instanceof Item) { if (existingMapping != item) { - List list= getNewList(); - list.add(existingMapping); + List<Item> list= getNewList(); + list.add((Item) existingMapping); list.add(item); fResourceToItem.put(resource, list); } } else { // List - List list= (List) existingMapping; + @SuppressWarnings("unchecked") + List<Item> list= (List<Item>) existingMapping; if (!list.contains(item)) { list.add(item); } @@ -140,7 +141,8 @@ public class ResourceToItemsMapper { } else if (existingMapping instanceof Item) { fResourceToItem.remove(resource); } else { // List - List list= (List) existingMapping; + @SuppressWarnings("unchecked") + List<Item> list= (List) existingMapping; list.remove(item); if (list.isEmpty()) { fResourceToItem.remove(list); @@ -150,14 +152,14 @@ public class ResourceToItemsMapper { } } - private List getNewList() { + private List<Item> getNewList() { if (!fReuseLists.isEmpty()) { - return (List) fReuseLists.pop(); + return fReuseLists.pop(); } - return new ArrayList(2); + return new ArrayList<Item>(2); } - private void releaseList(List list) { + private void releaseList(List<Item> list) { if (fReuseLists.size() < NUMBER_LIST_REUSE) { fReuseLists.push(list); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/Resources.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/Resources.java index 17210982fb0..5fe66944372 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/Resources.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/Resources.java @@ -97,7 +97,7 @@ public class Resources { * @see org.eclipse.core.resources.IWorkspace#validateEdit(org.eclipse.core.resources.IFile[], java.lang.Object) */ public static IStatus makeCommittable(IResource[] resources, Object context) { - List readOnlyFiles= new ArrayList(); + List<IResource> readOnlyFiles= new ArrayList<IResource>(); for (int i= 0; i < resources.length; i++) { IResource resource= resources[i]; if (resource.getType() == IResource.FILE) { @@ -110,16 +110,16 @@ public class Resources { if (readOnlyFiles.size() == 0) return new Status(IStatus.OK, CUIPlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$ - Map oldTimeStamps= createModificationStampMap(readOnlyFiles); + Map<IFile, Long> oldTimeStamps= createModificationStampMap(readOnlyFiles); IStatus status= ResourcesPlugin.getWorkspace().validateEdit( - (IFile[]) readOnlyFiles.toArray(new IFile[readOnlyFiles.size()]), context); + readOnlyFiles.toArray(new IFile[readOnlyFiles.size()]), context); if (!status.isOK()) return status; IStatus modified= null; - Map newTimeStamps= createModificationStampMap(readOnlyFiles); - for (Iterator iter= oldTimeStamps.keySet().iterator(); iter.hasNext();) { - IFile file= (IFile) iter.next(); + Map<IFile, Long> newTimeStamps= createModificationStampMap(readOnlyFiles); + for (Iterator<IFile> iter= oldTimeStamps.keySet().iterator(); iter.hasNext();) { + IFile file= iter.next(); if (!oldTimeStamps.get(file).equals(newTimeStamps.get(file))) modified= addModified(modified, file); } @@ -128,9 +128,9 @@ public class Resources { return new Status(IStatus.OK, CUIPlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$ } - private static Map createModificationStampMap(List files){ - Map map= new HashMap(); - for (Iterator iter= files.iterator(); iter.hasNext(); ) { + private static Map<IFile, Long> createModificationStampMap(List<IResource> files){ + Map<IFile, Long> map= new HashMap<IFile, Long>(); + for (Iterator<IResource> iter= files.iterator(); iter.hasNext(); ) { IFile file= (IFile)iter.next(); map.put(file, new Long(file.getModificationStamp())); } @@ -181,12 +181,12 @@ public class Resources { } public static String[] getLocationOSStrings(IResource[] resources) { - List result= new ArrayList(resources.length); + List<String> result= new ArrayList<String>(resources.length); for (int i= 0; i < resources.length; i++) { IPath location= resources[i].getLocation(); if (location != null) result.add(location.toOSString()); } - return (String[]) result.toArray(new String[result.size()]); + return result.toArray(new String[result.size()]); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/SelectionUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/SelectionUtil.java deleted file mode 100644 index 52c2b034e0d..00000000000 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/SelectionUtil.java +++ /dev/null @@ -1,124 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000 2005 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * QNX Software System - *******************************************************************************/ -package org.eclipse.cdt.internal.ui.util; - -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; - -/** - * Provides utilities for checking the validity of selections. - * <p> - * This class provides static methods only; it is not intended to be instantiated - * or subclassed. - * </p> - */ - -public class SelectionUtil { - - /** - * Returns the first element of the given selection. - * Returns null if the selection is empty or if - * the given selection is not of type <code>IStructuredSelection</code>. - * - * @param selection the selection - * @return the selected elements - * - */ - public static Object getFirstElement (ISelection selection) { - if (!(selection instanceof IStructuredSelection)) { - return null; - } - return ((IStructuredSelection)selection).getFirstElement (); - } - - public static Object getSingleElement (ISelection s) { - if (!(s instanceof IStructuredSelection)) - return null; - IStructuredSelection selection= (IStructuredSelection)s; - if (selection.size () != 1) - return null; - return selection.getFirstElement (); - } - - /** - * Returns the elements of the given selection. - * Returns an empty array if the selection is empty or if - * the given selection is not of type <code>IStructuredSelection</code>. - * - * @param selection the selection - * @return the selected elements - * - */ - - public static Object[] toArray(ISelection selection) { - if (!(selection instanceof IStructuredSelection)) { - return new Object[0]; - } - return ((IStructuredSelection)selection).toArray(); - } - - public static List toList(ISelection selection) { - if (selection instanceof IStructuredSelection) { - return ((IStructuredSelection)selection).toList(); - } - return null; - } - - /** - * Returns whether the types of the resources in the given selection are among - * the specified resource types. - * - * @param selection the selection - * @param resourceMask resource mask formed by bitwise OR of resource type - * constants (defined on <code>IResource</code>) - * @return <code>true</code> if all selected elements are resources of the right - * type, and <code>false</code> if at least one element is either a resource - * of some other type or a non-resource - * @see IResource#getType - */ - public static boolean allResourcesAreOfType(IStructuredSelection selection, int resourceMask) { - Iterator resources = selection.iterator(); - while (resources.hasNext()) { - Object next = resources.next(); - if (!(next instanceof IResource)) - return false; - if (!resourceIsType((IResource)next, resourceMask)) - return false; - } - return true; - } - - /** - * Returns whether the type of the given resource is among the specified - * resource types. - * - * @param resource the resource - * @param resourceMask resource mask formed by bitwise OR of resource type - * constants (defined on <code>IResource</code>) - * @return <code>true</code> if the resources has a matching type, and - * <code>false</code> otherwise - * @see IResource#getType - */ - public static boolean resourceIsType(IResource resource, int resourceMask) { - return ((resource != null) && ((resource.getType() & resourceMask) != 0)); - } - - /* (non-Javadoc) - * Private constructor to block instantiation. - */ - private SelectionUtil(){ - } -} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java index 47656e7c1f2..2234fdf6141 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java @@ -249,7 +249,7 @@ public class StringMatcher { } } - Vector temp= new Vector(); + Vector<String> temp= new Vector<String>(); int pos= 0; StringBuffer buf= new StringBuffer(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java index 46a10981557..04a2bf09b4e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java @@ -34,7 +34,7 @@ import org.eclipse.jface.viewers.ColumnWeightData; */ public class TableLayoutComposite extends Composite { - private List columns= new ArrayList(); + private List<ColumnLayoutData> columns= new ArrayList<ColumnLayoutData>(); /** * Creates a new <code>TableLayoutComposite</code>. @@ -76,7 +76,7 @@ public class TableLayoutComposite extends Composite { int width= 0; int size= columns.size(); for (int i= 0; i < size; ++i) { - ColumnLayoutData layoutData= (ColumnLayoutData) columns.get(i); + ColumnLayoutData layoutData= columns.get(i); if (layoutData instanceof ColumnPixelData) { ColumnPixelData col= (ColumnPixelData) layoutData; width += col.width; @@ -109,7 +109,7 @@ public class TableLayoutComposite extends Composite { // First calc space occupied by fixed columns for (int i= 0; i < size; i++) { - ColumnLayoutData col= (ColumnLayoutData) columns.get(i); + ColumnLayoutData col= columns.get(i); if (col instanceof ColumnPixelData) { int pixels= ((ColumnPixelData) col).width; widths[i]= pixels; @@ -132,7 +132,7 @@ public class TableLayoutComposite extends Composite { int rest= width - fixedWidth; int totalDistributed= 0; for (int i= 0; i < size; ++i) { - ColumnLayoutData col= (ColumnLayoutData) columns.get(i); + ColumnLayoutData col= columns.get(i); if (col instanceof ColumnWeightData) { ColumnWeightData cw= (ColumnWeightData) col; // calculate weight as above @@ -151,7 +151,7 @@ public class TableLayoutComposite extends Composite { for (int i= 0; diff > 0; ++i) { if (i == size) i= 0; - ColumnLayoutData col= (ColumnLayoutData) columns.get(i); + ColumnLayoutData col= columns.get(i); if (col instanceof ColumnWeightData) { ++widths[i]; --diff; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AdaptingSelectionProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AdaptingSelectionProvider.java index 9eb2e6e5e48..371a15e6c2e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AdaptingSelectionProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AdaptingSelectionProvider.java @@ -30,11 +30,11 @@ import org.eclipse.jface.viewers.StructuredSelection; */ public class AdaptingSelectionProvider implements ISelectionProvider, ISelectionChangedListener { - private Class fTargetType; + private Class<?> fTargetType; private ListenerList fListenerList; private ISelectionProvider fProvider; - public AdaptingSelectionProvider(Class targetType, ISelectionProvider provider) { + public AdaptingSelectionProvider(Class<?> targetType, ISelectionProvider provider) { fProvider= provider; fTargetType= targetType; fListenerList= new ListenerList(); @@ -44,8 +44,8 @@ public class AdaptingSelectionProvider implements ISelectionProvider, ISelection if (selection != null) { if (selection instanceof IStructuredSelection) { IStructuredSelection ss= (IStructuredSelection) selection; - ArrayList adapted= new ArrayList(); - for (Iterator iter = ss.iterator(); iter.hasNext(); ) { + ArrayList<Object> adapted= new ArrayList<Object>(); + for (Iterator<?> iter = ss.iterator(); iter.hasNext(); ) { Object elem= adaptElem(iter.next()); if (elem != null) { adapted.add(elem); @@ -92,8 +92,8 @@ public class AdaptingSelectionProvider implements ISelectionProvider, ISelection public void selectionChanged(SelectionChangedEvent event) { SelectionChangedEvent event2= new SelectionChangedEvent(this, convertSelection(event.getSelection())); Object[] listeners= fListenerList.getListeners(); - for (int i = 0; i < listeners.length; i++) { - ISelectionChangedListener l= (ISelectionChangedListener) listeners[i]; + for (Object listener : listeners) { + ISelectionChangedListener l= (ISelectionChangedListener) listener; l.selectionChanged(event2); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java index 81d4b8a2abc..2a289f4d264 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java @@ -43,16 +43,16 @@ public abstract class AsyncTreeContentProvider implements ITreeContentProvider { protected static final Object[] NO_CHILDREN = new Object[0]; private Object fInput; - private HashMap fChildNodes= new HashMap(); - private HashSet fHighPriorityTasks= new HashSet(); - private HashSet fLowPriorityTasks= new HashSet(); - private HashMap fViewUpdates= new HashMap(); + private HashMap<Object, Object[]> fChildNodes= new HashMap<Object, Object[]>(); + private HashSet<Object> fHighPriorityTasks= new HashSet<Object>(); + private HashSet<Object> fLowPriorityTasks= new HashSet<Object>(); + private HashMap<Object, Object[]> fViewUpdates= new HashMap<Object, Object[]>(); private int fViewUpdateDelta; private Job fJob; private Display fDisplay; private TreeViewer fTreeViewer= null; private Runnable fScheduledViewupdate= null; - private HashSet fAutoexpand; + private HashSet<Object> fAutoexpand; private Object fAutoSelect; public AsyncTreeContentProvider(Display disp) { @@ -133,7 +133,7 @@ public abstract class AsyncTreeContentProvider implements ITreeContentProvider { */ public void recompute() { if (getInput() != null) { - fAutoexpand= new HashSet(); + fAutoexpand= new HashSet<Object>(); fAutoexpand.addAll(Arrays.asList(fTreeViewer.getVisibleExpandedElements())); fAutoSelect= null; fAutoSelect= ((IStructuredSelection) fTreeViewer.getSelection()).getFirstElement(); @@ -244,7 +244,7 @@ public abstract class AsyncTreeContentProvider implements ITreeContentProvider { } runme= fScheduledViewupdate= new Runnable(){ public void run() { - HashMap updates= null; + HashMap<Object, Object[]> updates= null; synchronized(fHighPriorityTasks) { if (fViewUpdates.isEmpty()) { fScheduledViewupdate= null; @@ -254,19 +254,19 @@ public abstract class AsyncTreeContentProvider implements ITreeContentProvider { return; } updates= fViewUpdates; - fViewUpdates= new HashMap(); + fViewUpdates= new HashMap<Object, Object[]>(); } fChildNodes.putAll(updates); if (fTreeViewer instanceof ExtendedTreeViewer) { ((ExtendedTreeViewer) fTreeViewer).refresh(updates.keySet().toArray()); } else if (fTreeViewer != null) { - for (Iterator iter = updates.keySet().iterator(); iter.hasNext();) { + for (Iterator<Object> iter = updates.keySet().iterator(); iter.hasNext();) { fTreeViewer.refresh(iter.next()); } } - for (Iterator iter = updates.values().iterator(); iter.hasNext();) { - checkForAutoExpand((Object[]) iter.next()); + for (Iterator<Object[]> iter = updates.values().iterator(); iter.hasNext();) { + checkForAutoExpand(iter.next()); } fViewUpdateDelta= Math.min(1000, fViewUpdateDelta*2); fDisplay.timerExec(fViewUpdateDelta, this); @@ -336,7 +336,7 @@ public abstract class AsyncTreeContentProvider implements ITreeContentProvider { if (parentElement instanceof AsyncTreeWorkInProgressNode) { return NO_CHILDREN; } - Object[] children= (Object[]) fChildNodes.get(parentElement); + Object[] children= fChildNodes.get(parentElement); if (children == null) { children= syncronouslyComputeChildren(parentElement); if (children != null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CDTContextActivator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CDTContextActivator.java index 118ae1a310c..634966de73b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CDTContextActivator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CDTContextActivator.java @@ -49,9 +49,9 @@ import org.eclipse.cdt.internal.ui.editor.CContentOutlinePage; public class CDTContextActivator implements IWindowListener, IPartListener2 { private static CDTContextActivator sInstance= new CDTContextActivator(); - private Map fActivationPerOutline = new HashMap(); - private Map fActivationPerNavigator= new HashMap(); - private Collection fWindows= new HashSet(); + private Map<ContentOutline, IContextActivation> fActivationPerOutline = new HashMap<ContentOutline, IContextActivation>(); + private Map<CommonNavigator, SelectionListener> fActivationPerNavigator= new HashMap<CommonNavigator, SelectionListener>(); + private Collection<IWorkbenchWindow> fWindows= new HashSet<IWorkbenchWindow>(); private CDTContextActivator() { @@ -86,12 +86,12 @@ public class CDTContextActivator implements IWindowListener, IPartListener2 { } public void uninstall() { - for (Iterator iterator = fWindows.iterator(); iterator.hasNext();) { - IWorkbenchWindow window = (IWorkbenchWindow) iterator.next(); + for (Iterator<IWorkbenchWindow> iterator = fWindows.iterator(); iterator.hasNext();) { + IWorkbenchWindow window = iterator.next(); unregister(window); } - for (Iterator iterator = fActivationPerNavigator.values().iterator(); iterator.hasNext();) { - SelectionListener l= (SelectionListener) iterator.next(); + for (Iterator<SelectionListener> iterator = fActivationPerNavigator.values().iterator(); iterator.hasNext();) { + SelectionListener l= iterator.next(); l.uninstall(); } } @@ -135,7 +135,7 @@ public class CDTContextActivator implements IWindowListener, IPartListener2 { } } else { - IContextActivation activation = (IContextActivation) fActivationPerOutline.remove(outline); + IContextActivation activation = fActivationPerOutline.remove(outline); if (activation != null) { // other outline page brought to front IContextService ctxtService = (IContextService)outline.getViewSite().getService(IContextService.class); @@ -194,7 +194,7 @@ public class CDTContextActivator implements IWindowListener, IPartListener2 { } private void onCommonNavigatorActivated(CommonNavigator part) { - SelectionListener l= (SelectionListener) fActivationPerNavigator.get(part); + SelectionListener l= fActivationPerNavigator.get(part); if (l == null) { l= new SelectionListener(part.getSite()); fActivationPerNavigator.put(part, l); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java index 6bde7ef1b92..5fa800dd0d4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java @@ -32,7 +32,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { protected CElementImageProvider fImageLabelProvider; protected StorageLabelProvider fStorageLabelProvider; - private ArrayList fLabelDecorators; + private ArrayList<ILabelDecorator> fLabelDecorators; private int fImageFlags; private int fTextFlags; @@ -64,7 +64,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { */ public void addLabelDecorator(ILabelDecorator decorator) { if (fLabelDecorators == null) { - fLabelDecorators= new ArrayList(2); + fLabelDecorators= new ArrayList<ILabelDecorator>(2); } fLabelDecorators.add(decorator); } @@ -122,7 +122,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { protected Image decorateImage(Image image, Object element) { if (fLabelDecorators != null && image != null) { for (int i= 0; i < fLabelDecorators.size(); i++) { - ILabelDecorator decorator= (ILabelDecorator) fLabelDecorators.get(i); + ILabelDecorator decorator= fLabelDecorators.get(i); image= decorator.decorateImage(image, element); } } @@ -145,7 +145,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { protected String decorateText(String text, Object element) { if (fLabelDecorators != null && text.length() > 0) { for (int i= 0; i < fLabelDecorators.size(); i++) { - ILabelDecorator decorator= (ILabelDecorator) fLabelDecorators.get(i); + ILabelDecorator decorator= fLabelDecorators.get(i); text= decorator.decorateText(text, element); } } @@ -173,7 +173,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { public void dispose() { if (fLabelDecorators != null) { for (int i= 0; i < fLabelDecorators.size(); i++) { - ILabelDecorator decorator= (ILabelDecorator) fLabelDecorators.get(i); + ILabelDecorator decorator= fLabelDecorators.get(i); decorator.dispose(); } fLabelDecorators= null; @@ -189,7 +189,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { public void addListener(ILabelProviderListener listener) { if (fLabelDecorators != null) { for (int i= 0; i < fLabelDecorators.size(); i++) { - ILabelDecorator decorator= (ILabelDecorator) fLabelDecorators.get(i); + ILabelDecorator decorator= fLabelDecorators.get(i); decorator.addListener(listener); } } @@ -211,7 +211,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { public void removeListener(ILabelProviderListener listener) { if (fLabelDecorators != null) { for (int i= 0; i < fLabelDecorators.size(); i++) { - ILabelDecorator decorator= (ILabelDecorator) fLabelDecorators.get(i); + ILabelDecorator decorator= fLabelDecorators.get(i); decorator.removeListener(listener); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/DecoratingCLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/DecoratingCLabelProvider.java index bddadc967f3..5033c79d04b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/DecoratingCLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/DecoratingCLabelProvider.java @@ -10,14 +10,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; -import org.eclipse.swt.graphics.Color; - import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.jface.viewers.IColorProvider; - +import org.eclipse.swt.graphics.Color; import org.eclipse.ui.PlatformUI; -public class DecoratingCLabelProvider extends DecoratingLabelProvider implements IColorProvider { +public class DecoratingCLabelProvider extends DecoratingLabelProvider { /** * Decorating label provider for Java. Combines a JavaUILabelProvider diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ListContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ListContentProvider.java index 2bbebd11445..6d1cf5a1fde 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ListContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ListContentProvider.java @@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.Viewer; * A specialized content provider to show a list of editor parts. */ public class ListContentProvider implements IStructuredContentProvider { - List fContents; + List<?> fContents; public ListContentProvider() { } @@ -32,7 +32,7 @@ public class ListContentProvider implements IStructuredContentProvider { public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (newInput instanceof List) - fContents= (List)newInput; + fContents= (List<?>)newInput; else fContents= null; // we use a fixed set. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java index 2e2e827e276..f6cbcfbb398 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java @@ -174,7 +174,7 @@ public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabe if (tu != null && tu.exists()) { return getErrorTicksFromMarkers(tu.getResource(), IResource.DEPTH_ONE, (ISourceReference)element); } - default: + break; } } else if (obj instanceof IResource) { return getErrorTicksFromMarkers((IResource) obj, IResource.DEPTH_INFINITE, null) | getTicks((IResource)obj); @@ -347,8 +347,8 @@ public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabe if (fListeners != null && !fListeners.isEmpty()) { LabelProviderChangedEvent event= new ProblemsLabelChangedEvent(this, changedResources, isMarkerChange); Object[] listeners= fListeners.getListeners(); - for (int i= 0; i < listeners.length; i++) { - ((ILabelProviderListener) listeners[i]).labelProviderChanged(event); + for (Object listener : listeners) { + ((ILabelProviderListener) listener).labelProviderChanged(event); } } } @@ -379,9 +379,9 @@ public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabe if (prjd != null) { ICConfigurationDescription [] cf = prjd.getConfigurations(); if (cf == null) return 0; - for (int i=0; i<cf.length; i++) { - if (cf[i].isActive()) { - ICResourceDescription out = cf[i].getResourceDescription(path, true); + for (ICConfigurationDescription element : cf) { + if (element.isActive()) { + ICResourceDescription out = element.getResourceDescription(path, true); if (out != null) result |= TICK_CONFIGURATION; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java index 74a991d40c1..6b8f299317e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java @@ -92,9 +92,8 @@ public final class ProjectTemplateStore { public TemplatePersistenceData[] getTemplateData() { if (fProjectStore != null) { return fProjectStore.getTemplateData(true); - } else { - return fInstanceStore.getTemplateData(true); } + return fInstanceStore.getTemplateData(true); } public Template findTemplateById(String id) { @@ -111,19 +110,18 @@ public final class ProjectTemplateStore { if (fProjectStore != null) { fProjectStore.load(); - Set datas= new HashSet(); + Set<String> datas= new HashSet<String>(); TemplatePersistenceData[] data= fProjectStore.getTemplateData(false); - for (int i= 0; i < data.length; i++) { - String id= data[i].getId(); + for (TemplatePersistenceData element : data) { + String id= element.getId(); if (id == null) { - id= data[i].getTemplate().getName(); + id= element.getTemplate().getName(); } datas.add(id); } data= fInstanceStore.getTemplateData(false); - for (int i= 0; i < data.length; i++) { - TemplatePersistenceData orig= data[i]; + for (TemplatePersistenceData orig : data) { String origId= orig.getId(); if (origId == null) { origId= orig.getTemplate().getName(); @@ -155,9 +153,8 @@ public final class ProjectTemplateStore { TemplatePersistenceData data= fProjectStore.getTemplateData(id); if (data == null) { return; // does not exist - } else { - data.setDeleted(!projectSpecific); } + data.setDeleted(!projectSpecific); } public void restoreDefaults() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionProviderMediator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionProviderMediator.java index 4bc615d8f71..5e9c83f729a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionProviderMediator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionProviderMediator.java @@ -26,7 +26,7 @@ import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.widgets.Control; public class SelectionProviderMediator implements ISelectionProvider { - private Map fProviders= new HashMap(); + private Map<Control, ISelectionProvider> fProviders= new HashMap<Control, ISelectionProvider>(); private ISelectionProvider fActiveProvider = null; private ISelectionChangedListener fSelectionChangedListener; private FocusListener fFocusListener; @@ -93,7 +93,7 @@ public class SelectionProviderMediator implements ISelectionProvider { } protected void onFocusGained(FocusEvent e) { - ISelectionProvider provider= (ISelectionProvider) fProviders.get(e.widget); + ISelectionProvider provider= fProviders.get(e.widget); if (provider != null) { fActiveProvider= provider; fireSelectionChanged(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java index edd0c21ee88..3673ad24b14 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java @@ -12,10 +12,11 @@ package org.eclipse.cdt.internal.ui.viewsupport; -import org.eclipse.cdt.ui.*; -import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.cdt.ui.CElementLabelProvider; +import org.eclipse.cdt.ui.CUIPlugin; + /** * CElementLabelProvider that respects settings from the Appearance preference page. @@ -24,7 +25,7 @@ import org.eclipse.jface.util.PropertyChangeEvent; * @deprecated Use {@link AppearanceAwareLabelProvider} instead. */ @Deprecated -public class StandardCElementLabelProvider extends AppearanceAwareLabelProvider implements IPropertyChangeListener { +public class StandardCElementLabelProvider extends AppearanceAwareLabelProvider { /** * Constructor for StandardCElementLabelProvider. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java index 58f0a683903..4067604a450 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java @@ -34,7 +34,7 @@ import org.eclipse.ui.PlatformUI; public class StorageLabelProvider extends LabelProvider { private IEditorRegistry fEditorRegistry= PlatformUI.getWorkbench().getEditorRegistry(); - private Map fJarImageMap= new HashMap(10); + private Map<String, Image> fJarImageMap= new HashMap<String, Image>(10); private Image fDefaultImage; /* (non-Javadoc) @@ -66,9 +66,9 @@ public class StorageLabelProvider extends LabelProvider { @Override public void dispose() { if (fJarImageMap != null) { - Iterator each= fJarImageMap.values().iterator(); + Iterator<Image> each= fJarImageMap.values().iterator(); while (each.hasNext()) { - Image image= (Image)each.next(); + Image image= each.next(); image.dispose(); } fJarImageMap= null; @@ -91,7 +91,7 @@ public class StorageLabelProvider extends LabelProvider { // Try to find icon for full name String name= element.getName(); - Image image= (Image)fJarImageMap.get(name); + Image image= fJarImageMap.get(name); if (image != null) return image; IFileEditorMapping[] mappings= fEditorRegistry.getFileEditorMappings(); @@ -110,7 +110,7 @@ public class StorageLabelProvider extends LabelProvider { key= path.getFileExtension(); if (key == null) return getDefaultImage(); - image= (Image)fJarImageMap.get(key); + image= fJarImageMap.get(key); if (image != null) return image; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/TreeNavigator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/TreeNavigator.java index ab3fe9318a1..d2580bddabf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/TreeNavigator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/TreeNavigator.java @@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.TreeItem; */ public class TreeNavigator { private Tree fTree; - private Class fDataClass; + private Class<?> fDataClass; /** * Creates a tree navigator for the given tree. It allows for finding tree items. @@ -28,7 +28,7 @@ public class TreeNavigator { * @param tree the tree to operate on * @param dataClass the required class for the data of the tree nodes, or <code>null</code>. */ - public TreeNavigator(Tree tree, Class dataClass) { + public TreeNavigator(Tree tree, Class<?> dataClass) { fTree= tree; fDataClass= dataClass; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilter.java index c7a599a2aa5..015e83958bb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilter.java @@ -24,7 +24,7 @@ public class WorkingSetFilter { private static final Object ACCEPT = new Object(); private static final Object REJECT = new Object(); - private HashMap fResourceFilter= null; + private HashMap<IPath, Object> fResourceFilter= null; public synchronized boolean isPartOfWorkingSet(ICElement elem) { if (fResourceFilter == null) { @@ -79,7 +79,7 @@ public class WorkingSetFilter { } else { IAdaptable[] input = workingSetFilter.getElements(); - fResourceFilter = new HashMap(); + fResourceFilter = new HashMap<IPath, Object>(); for (int i = 0; i < input.length; i++) { IAdaptable adaptable = input[i]; IResource res = (IResource) adaptable.getAdapter(IResource.class); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilterUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilterUI.java index 530d8af6be5..da190d7ca62 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilterUI.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilterUI.java @@ -166,9 +166,9 @@ public abstract class WorkingSetFilterUI { fWorkingSetFilterGroup.setWorkingSet(fWorkingSet); } - public List getRecent() { + public List<String> getRecent() { IWorkingSet[] workingSets= fWSManager.getRecentWorkingSets(); - ArrayList result= new ArrayList(workingSets.length); + ArrayList<String> result= new ArrayList<String>(workingSets.length); for (int i = 0; i < workingSets.length; i++) { result.add(workingSets[i].getName()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java index 2313c15cd5f..160ff804b9c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java @@ -12,9 +12,6 @@ package org.eclipse.cdt.internal.ui.wizards; import java.util.Iterator; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; -import org.eclipse.cdt.internal.ui.util.PixelConverter; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; @@ -38,9 +35,14 @@ import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.IWorkbenchWizard; import org.eclipse.ui.actions.NewProjectAction; +import org.eclipse.cdt.ui.CUIPlugin; + +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.internal.ui.util.PixelConverter; + public abstract class AbstractOpenWizardAction extends Action implements IWorkbenchWindowActionDelegate { - private Class[] fActivatedOnTypes; + private Class<?>[] fActivatedOnTypes; private boolean fAcceptEmptySelection; /** @@ -59,7 +61,7 @@ public abstract class AbstractOpenWizardAction extends Action implements IWorkbe * are of the given types. <code>null</code> will allow all types. * @param acceptEmptySelection Specifies if the action allows an empty selection */ - public AbstractOpenWizardAction(String label, Class[] activatedOnTypes, boolean acceptEmptySelection) { + public AbstractOpenWizardAction(String label, Class<?>[] activatedOnTypes, boolean acceptEmptySelection) { super(label); fActivatedOnTypes= activatedOnTypes; fAcceptEmptySelection= acceptEmptySelection; @@ -80,8 +82,8 @@ public abstract class AbstractOpenWizardAction extends Action implements IWorkbe private boolean isOfAcceptedType(Object obj) { if (fActivatedOnTypes != null) { - for (int i= 0; i < fActivatedOnTypes.length; i++) { - if (fActivatedOnTypes[i].isInstance(obj)) { + for (Class<?> activatedOnType : fActivatedOnTypes) { + if (activatedOnType.isInstance(obj)) { return true; } } @@ -92,7 +94,7 @@ public abstract class AbstractOpenWizardAction extends Action implements IWorkbe private boolean isEnabled(IStructuredSelection selection) { - Iterator iter= selection.iterator(); + Iterator<?> iter= selection.iterator(); while (iter.hasNext()) { Object obj= iter.next(); if (!isOfAcceptedType(obj) || !shouldAcceptElement(obj)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CWizardRegistry.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CWizardRegistry.java index ed8e80a0260..62e7eaedbca 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CWizardRegistry.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CWizardRegistry.java @@ -13,13 +13,14 @@ package org.eclipse.cdt.internal.ui.wizards; import java.util.ArrayList; import java.util.List; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.action.IAction; import org.eclipse.ui.PlatformUI; +import org.eclipse.cdt.ui.CUIPlugin; + /** * Convenience class for drop-in C/C++ Wizard contributions. */ @@ -94,7 +95,7 @@ public class CWizardRegistry { * @return an array of IConfigurationElement */ public static IConfigurationElement[] getProjectWizardElements() { - List elemList = new ArrayList(); + List<IConfigurationElement> elemList = new ArrayList<IConfigurationElement>(); IConfigurationElement[] elements = getAllWizardElements(); for (int i = 0; i < elements.length; ++i) { IConfigurationElement element = elements[i]; @@ -102,7 +103,7 @@ public class CWizardRegistry { elemList.add(element); } } - return (IConfigurationElement[]) elemList.toArray(new IConfigurationElement[elemList.size()]); + return elemList.toArray(new IConfigurationElement[elemList.size()]); } private static boolean isProjectWizard(IConfigurationElement element) { @@ -113,10 +114,9 @@ public class CWizardRegistry { IConfigurationElement[] classElements = element.getChildren(TAG_CLASS); if (classElements.length > 0) { - for (int i = 0; i < classElements.length; i++) { - IConfigurationElement[] paramElements = classElements[i].getChildren(TAG_PARAMETER); - for (int k = 0; k < paramElements.length; k++) { - IConfigurationElement curr = paramElements[k]; + for (IConfigurationElement classElement : classElements) { + IConfigurationElement[] paramElements = classElement.getChildren(TAG_PARAMETER); + for (IConfigurationElement curr : paramElements) { String name = curr.getAttribute(TAG_NAME); if (name != null && (name.equals(ATT_CPROJECT) || name.equals(ATT_CCPROJECT))) { String value = curr.getAttribute(TAG_VALUE); @@ -162,7 +162,7 @@ public class CWizardRegistry { * @return an array of IConfigurationElement */ public static IConfigurationElement[] getTypeWizardElements() { - List elemList = new ArrayList(); + List<IConfigurationElement> elemList = new ArrayList<IConfigurationElement>(); IConfigurationElement[] elements = getAllWizardElements(); for (int i = 0; i < elements.length; ++i) { IConfigurationElement element = elements[i]; @@ -170,16 +170,15 @@ public class CWizardRegistry { elemList.add(element); } } - return (IConfigurationElement[]) elemList.toArray(new IConfigurationElement[elemList.size()]); + return elemList.toArray(new IConfigurationElement[elemList.size()]); } private static boolean isTypeWizard(IConfigurationElement element) { IConfigurationElement[] classElements = element.getChildren(TAG_CLASS); if (classElements.length > 0) { - for (int i = 0; i < classElements.length; i++) { - IConfigurationElement[] paramElements = classElements[i].getChildren(TAG_PARAMETER); - for (int k = 0; k < paramElements.length; k++) { - IConfigurationElement curr = paramElements[k]; + for (IConfigurationElement classElement : classElements) { + IConfigurationElement[] paramElements = classElement.getChildren(TAG_PARAMETER); + for (IConfigurationElement curr : paramElements) { String name = curr.getAttribute(TAG_NAME); if (name != null && name.equals(ATT_CTYPE)) { String value = curr.getAttribute(TAG_VALUE); @@ -223,7 +222,7 @@ public class CWizardRegistry { * @return an array of IConfigurationElement */ public static IConfigurationElement[] getFileWizardElements() { - List elemList = new ArrayList(); + List<IConfigurationElement> elemList = new ArrayList<IConfigurationElement>(); IConfigurationElement[] elements = getAllWizardElements(); for (int i = 0; i < elements.length; ++i) { IConfigurationElement element = elements[i]; @@ -231,16 +230,15 @@ public class CWizardRegistry { elemList.add(element); } } - return (IConfigurationElement[]) elemList.toArray(new IConfigurationElement[elemList.size()]); + return elemList.toArray(new IConfigurationElement[elemList.size()]); } private static boolean isFileWizard(IConfigurationElement element) { IConfigurationElement[] classElements = element.getChildren(TAG_CLASS); if (classElements.length > 0) { - for (int i = 0; i < classElements.length; i++) { - IConfigurationElement[] paramElements = classElements[i].getChildren(TAG_PARAMETER); - for (int k = 0; k < paramElements.length; k++) { - IConfigurationElement curr = paramElements[k]; + for (IConfigurationElement classElement : classElements) { + IConfigurationElement[] paramElements = classElement.getChildren(TAG_PARAMETER); + for (IConfigurationElement curr : paramElements) { String name = curr.getAttribute(TAG_NAME); if (name != null && name.equals(ATT_CFILE)) { String value = curr.getAttribute(TAG_VALUE); @@ -284,7 +282,7 @@ public class CWizardRegistry { * @return an array of IConfigurationElement */ public static IConfigurationElement[] getFolderWizardElements() { - List elemList = new ArrayList(); + List<IConfigurationElement> elemList = new ArrayList<IConfigurationElement>(); IConfigurationElement[] elements = getAllWizardElements(); for (int i = 0; i < elements.length; ++i) { IConfigurationElement element = elements[i]; @@ -292,16 +290,15 @@ public class CWizardRegistry { elemList.add(element); } } - return (IConfigurationElement[]) elemList.toArray(new IConfigurationElement[elemList.size()]); + return elemList.toArray(new IConfigurationElement[elemList.size()]); } private static boolean isFolderWizard(IConfigurationElement element) { IConfigurationElement[] classElements = element.getChildren(TAG_CLASS); if (classElements.length > 0) { - for (int i = 0; i < classElements.length; i++) { - IConfigurationElement[] paramElements = classElements[i].getChildren(TAG_PARAMETER); - for (int k = 0; k < paramElements.length; k++) { - IConfigurationElement curr = paramElements[k]; + for (IConfigurationElement classElement : classElements) { + IConfigurationElement[] paramElements = classElement.getChildren(TAG_PARAMETER); + for (IConfigurationElement curr : paramElements) { String name = curr.getAttribute(TAG_NAME); if (name != null && name.equals(ATT_CFOLDER)) { String value = curr.getAttribute(TAG_VALUE); @@ -319,7 +316,7 @@ public class CWizardRegistry { } private static String[] getWizardIDs(IConfigurationElement[] elements) { - List idList = new ArrayList(); + List<String> idList = new ArrayList<String>(); // add C wizards first for (int i = 0; i < elements.length; ++i) { @@ -342,12 +339,12 @@ public class CWizardRegistry { } } - return (String[]) idList.toArray(new String[idList.size()]); + return idList.toArray(new String[idList.size()]); } private static IAction[] createActions(IConfigurationElement[] elements) { - List idList = new ArrayList(); - List actionList = new ArrayList(); + List<String> idList = new ArrayList<String>(); + List<IAction> actionList = new ArrayList<IAction>(); // add C wizards first for (int i = 0; i < elements.length; ++i) { @@ -357,9 +354,7 @@ public class CWizardRegistry { if (id != null && !idList.contains(id)) { idList.add(id); IAction action = new OpenNewWizardAction(element); - if (action != null) { - actionList.add(action); - } + actionList.add(action); } } } @@ -371,14 +366,12 @@ public class CWizardRegistry { if (id != null && !idList.contains(id)) { idList.add(id); IAction action = new OpenNewWizardAction(element); - if (action != null) { - actionList.add(action); - } + actionList.add(action); } } } - return (IAction[]) actionList.toArray(new IAction[actionList.size()]); + return actionList.toArray(new IAction[actionList.size()]); } /** @@ -396,12 +389,11 @@ public class CWizardRegistry { * @return an array of IConfigurationElement */ public static IConfigurationElement[] getAllWizardElements() { - List elemList = new ArrayList(); + List<IConfigurationElement> elemList = new ArrayList<IConfigurationElement>(); IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(PlatformUI.PLUGIN_ID, PL_NEW); if (extensionPoint != null) { IConfigurationElement[] elements = extensionPoint.getConfigurationElements(); - for (int i = 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; + for (IConfigurationElement element : elements) { if (element.getName().equals(TAG_WIZARD)) { String category = element.getAttribute(ATT_CATEGORY); if (category != null && @@ -412,7 +404,7 @@ public class CWizardRegistry { } } } - return (IConfigurationElement[]) elemList.toArray(new IConfigurationElement[elemList.size()]); + return elemList.toArray(new IConfigurationElement[elemList.size()]); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/SourceFolderSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/SourceFolderSelectionDialog.java index 227ebc4bbbb..0f2fcafa03b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/SourceFolderSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/SourceFolderSelectionDialog.java @@ -30,10 +30,10 @@ import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; public class SourceFolderSelectionDialog extends ElementTreeSelectionDialog { - private static final Class[] VALIDATOR_CLASSES = new Class[] { ICContainer.class, ICProject.class }; + private static final Class<?>[] VALIDATOR_CLASSES = new Class<?>[] { ICContainer.class, ICProject.class }; private static final TypedElementSelectionValidator fValidator = new TypedElementSelectionValidator(VALIDATOR_CLASSES, false); - private static final Class[] FILTER_CLASSES = new Class[] { ICModel.class, ICContainer.class, ICProject.class }; + private static final Class<?>[] FILTER_CLASSES = new Class<?>[] { ICModel.class, ICContainer.class, ICProject.class }; private static final ViewerFilter fFilter = new TypedViewerFilter(FILTER_CLASSES); private static final ViewerSorter fSorter = new CElementSorter(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java index ffabcfad8f1..d035bc520b4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java @@ -13,9 +13,6 @@ package org.eclipse.cdt.internal.ui.wizards.classwizard; import java.util.List; -import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnWeightData; @@ -29,7 +26,12 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Item; import org.eclipse.swt.widgets.Table; -public class BaseClassesListDialogField extends ListDialogField { +import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; + +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; + +public class BaseClassesListDialogField extends ListDialogField<IBaseClassInfo> { // column properties private static final String CP_NAME = "name"; //$NON-NLS-1$ @@ -97,7 +99,7 @@ public class BaseClassesListDialogField extends ListDialogField { } } - public BaseClassesListDialogField(String title, IListAdapter listAdapter) { + public BaseClassesListDialogField(String title, IListAdapter<IBaseClassInfo> listAdapter) { super(listAdapter, new String[] { /* 0 */ NewClassWizardMessages.getString("BaseClassesListDialogField.buttons.add"), //$NON-NLS-1$ @@ -174,7 +176,7 @@ public class BaseClassesListDialogField extends ListDialogField { } public IBaseClassInfo[] getBaseClasses() { - List baseClasses = getElements(); - return (IBaseClassInfo[]) baseClasses.toArray(new IBaseClassInfo[baseClasses.size()]); + List<IBaseClassInfo> baseClasses = getElements(); + return baseClasses.toArray(new IBaseClassInfo[baseClasses.size()]); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java index f4d98eeb56c..058fd72dcfe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java @@ -13,10 +13,6 @@ package org.eclipse.cdt.internal.ui.wizards.classwizard; import java.util.List; -import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnWeightData; @@ -30,7 +26,13 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Item; import org.eclipse.swt.widgets.Table; -public class MethodStubsListDialogField extends CheckedListDialogField { +import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; + +import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; + +public class MethodStubsListDialogField extends CheckedListDialogField<IMethodStub> { // column properties private static final String CP_NAME = "name"; //$NON-NLS-1$ @@ -116,7 +118,7 @@ public class MethodStubsListDialogField extends CheckedListDialogField { } } - public MethodStubsListDialogField(String title, IListAdapter listAdapter) { + public MethodStubsListDialogField(String title, IListAdapter<IMethodStub> listAdapter) { super(listAdapter, null, new MethodStubsLabelProvider()); setLabelText(title); @@ -189,12 +191,12 @@ public class MethodStubsListDialogField extends CheckedListDialogField { } public IMethodStub[] getMethodStubs() { - List allStubs = getElements(); - return (IMethodStub[]) allStubs.toArray(new IMethodStub[allStubs.size()]); + List<IMethodStub> allStubs = getElements(); + return allStubs.toArray(new IMethodStub[allStubs.size()]); } public IMethodStub[] getCheckedMethodStubs() { - List checkedStubs = getCheckedElements(); - return (IMethodStub[]) checkedStubs.toArray(new IMethodStub[checkedStubs.size()]); + List<IMethodStub> checkedStubs = getCheckedElements(); + return checkedStubs.toArray(new IMethodStub[checkedStubs.size()]); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java index 7bc9be8be96..16354e76243 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java @@ -30,8 +30,8 @@ public class NewBaseClassSelectionDialog extends TypeSelectionDialog { private static final String DIALOG_SETTINGS = NewBaseClassSelectionDialog.class.getName(); private static final int[] VISIBLE_TYPES = { ICElement.C_CLASS, ICElement.C_STRUCT }; private static final int ADD_ID = IDialogConstants.CLIENT_ID + 1; - private List fTypeList; - private List fTypeListeners; + private List<ITypeInfo> fTypeList; + private List<ITypeSelectionListener> fTypeListeners; public interface ITypeSelectionListener { void typeAdded(ITypeInfo baseClass); @@ -45,8 +45,8 @@ public class NewBaseClassSelectionDialog extends TypeSelectionDialog { setVisibleTypes(VISIBLE_TYPES); setFilter("*", true); //$NON-NLS-1$ setStatusLineAboveButtons(true); - fTypeList = new ArrayList(); - fTypeListeners = new ArrayList(); + fTypeList = new ArrayList<ITypeInfo>(); + fTypeListeners = new ArrayList<ITypeSelectionListener>(); } public void addListener(ITypeSelectionListener listener) { @@ -60,15 +60,15 @@ public class NewBaseClassSelectionDialog extends TypeSelectionDialog { private void notifyTypeAddedListeners(ITypeInfo type) { // first copy listeners in case one calls removeListener - List list = new ArrayList(fTypeListeners); - for (Iterator i = list.iterator(); i.hasNext(); ) { - ITypeSelectionListener listener = (ITypeSelectionListener) i.next(); + List<ITypeSelectionListener> list = new ArrayList<ITypeSelectionListener>(fTypeListeners); + for (Iterator<ITypeSelectionListener> i = list.iterator(); i.hasNext(); ) { + ITypeSelectionListener listener = i.next(); listener.typeAdded(type); } } public ITypeInfo[] getAddedTypes() { - return (ITypeInfo[])fTypeList.toArray(new ITypeInfo[fTypeList.size()]); + return fTypeList.toArray(new ITypeInfo[fTypeList.size()]); } /* diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java index d13db083145..31b5f564767 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java @@ -158,32 +158,32 @@ public class NewClassCodeGenerator { if (fHeaderPath != null) { // get method stubs - List publicMethods = getStubs(ASTAccessVisibility.PUBLIC, false); - List protectedMethods = getStubs(ASTAccessVisibility.PROTECTED, false); - List privateMethods = getStubs(ASTAccessVisibility.PRIVATE, false); + List<IMethodStub> publicMethods = getStubs(ASTAccessVisibility.PUBLIC, false); + List<IMethodStub> protectedMethods = getStubs(ASTAccessVisibility.PROTECTED, false); + List<IMethodStub> privateMethods = getStubs(ASTAccessVisibility.PRIVATE, false); IFile headerFile = NewSourceFileGenerator.createHeaderFile(fHeaderPath, true, new SubProgressMonitor(monitor, 50)); if (headerFile != null) { headerTU = (ITranslationUnit) CoreModel.getDefault().create(headerFile); - } - - // create a working copy with a new owner - headerWorkingCopy = headerTU.getWorkingCopy(); - // headerWorkingCopy = headerTU.getSharedWorkingCopy(null, CUIPlugin.getDefault().getBufferFactory()); - - String headerContent = constructHeaderFileContent(headerTU, publicMethods, protectedMethods, privateMethods, headerWorkingCopy.getBuffer().getContents(), new SubProgressMonitor(monitor, 100)); - headerContent= formatSource(headerContent, headerTU); - headerWorkingCopy.getBuffer().setContents(headerContent); - if (monitor.isCanceled()) { - throw new InterruptedException(); + // create a working copy with a new owner + headerWorkingCopy = headerTU.getWorkingCopy(); + // headerWorkingCopy = headerTU.getSharedWorkingCopy(null, CUIPlugin.getDefault().getBufferFactory()); + + String headerContent = constructHeaderFileContent(headerTU, publicMethods, protectedMethods, privateMethods, headerWorkingCopy.getBuffer().getContents(), new SubProgressMonitor(monitor, 100)); + headerContent= formatSource(headerContent, headerTU); + headerWorkingCopy.getBuffer().setContents(headerContent); + + if (monitor.isCanceled()) { + throw new InterruptedException(); + } + + headerWorkingCopy.reconcile(); + headerWorkingCopy.commit(true, monitor); + monitor.worked(50); + + createdClass = headerWorkingCopy.getElement(fFullyQualifiedClassName); } - - headerWorkingCopy.reconcile(); - headerWorkingCopy.commit(true, monitor); - monitor.worked(50); - - createdClass = headerWorkingCopy.getElement(fFullyQualifiedClassName); fCreatedClass = createdClass; fCreatedHeaderTU = headerTU; } @@ -191,9 +191,9 @@ public class NewClassCodeGenerator { if (fSourcePath != null) { // get method stubs - List publicMethods = getStubs(ASTAccessVisibility.PUBLIC, true); - List protectedMethods = getStubs(ASTAccessVisibility.PROTECTED, true); - List privateMethods = getStubs(ASTAccessVisibility.PRIVATE, true); + List<IMethodStub> publicMethods = getStubs(ASTAccessVisibility.PUBLIC, true); + List<IMethodStub> protectedMethods = getStubs(ASTAccessVisibility.PROTECTED, true); + List<IMethodStub> privateMethods = getStubs(ASTAccessVisibility.PRIVATE, true); if (publicMethods.isEmpty() && protectedMethods.isEmpty() && privateMethods.isEmpty()) { //TODO need prefs option @@ -203,23 +203,23 @@ public class NewClassCodeGenerator { IFile sourceFile = NewSourceFileGenerator.createSourceFile(fSourcePath, true, new SubProgressMonitor(monitor, 50)); if (sourceFile != null) { sourceTU = (ITranslationUnit) CoreModel.getDefault().create(sourceFile); + monitor.worked(50); + + // create a working copy with a new owner + sourceWorkingCopy = sourceTU.getWorkingCopy(); + + String sourceContent = constructSourceFileContent(sourceTU, headerTU, publicMethods, protectedMethods, privateMethods, sourceWorkingCopy.getBuffer().getContents(), new SubProgressMonitor(monitor, 100)); + sourceContent= formatSource(sourceContent, sourceTU); + sourceWorkingCopy.getBuffer().setContents(sourceContent); + + if (monitor.isCanceled()) { + throw new InterruptedException(); + } + + sourceWorkingCopy.reconcile(); + sourceWorkingCopy.commit(true, monitor); + monitor.worked(50); } - monitor.worked(50); - - // create a working copy with a new owner - sourceWorkingCopy = sourceTU.getWorkingCopy(); - - String sourceContent = constructSourceFileContent(sourceTU, headerTU, publicMethods, protectedMethods, privateMethods, sourceWorkingCopy.getBuffer().getContents(), new SubProgressMonitor(monitor, 100)); - sourceContent= formatSource(sourceContent, sourceTU); - sourceWorkingCopy.getBuffer().setContents(sourceContent); - - if (monitor.isCanceled()) { - throw new InterruptedException(); - } - - sourceWorkingCopy.reconcile(); - sourceWorkingCopy.commit(true, monitor); - monitor.worked(50); fCreatedSourceTU = sourceTU; } @@ -262,7 +262,7 @@ public class NewClassCodeGenerator { return content; } - public String constructHeaderFileContent(ITranslationUnit headerTU, List publicMethods, List protectedMethods, List privateMethods, String oldContents, IProgressMonitor monitor) throws CoreException { + public String constructHeaderFileContent(ITranslationUnit headerTU, List<IMethodStub> publicMethods, List<IMethodStub> protectedMethods, List<IMethodStub> privateMethods, String oldContents, IProgressMonitor monitor) throws CoreException { monitor.beginTask(NewClassWizardMessages.getString("NewClassCodeGeneration.createType.task.header"), 100); //$NON-NLS-1$ String lineDelimiter= StubUtility.getLineDelimiterUsed(headerTU); @@ -424,12 +424,11 @@ public class NewClassCodeGenerator { } } - private void addMethodDeclarations(ITranslationUnit tu, List publicMethods, List protectedMethods, List privateMethods, StringBuffer text, String lineDelimiter) throws CoreException { + private void addMethodDeclarations(ITranslationUnit tu, List<IMethodStub> publicMethods, List<IMethodStub> protectedMethods, List<IMethodStub> privateMethods, StringBuffer text, String lineDelimiter) throws CoreException { if (!publicMethods.isEmpty()) { text.append("public:"); //$NON-NLS-1$ text.append(lineDelimiter); - for (Iterator i = publicMethods.iterator(); i.hasNext();) { - IMethodStub stub = (IMethodStub) i.next(); + for (IMethodStub stub : publicMethods) { String code = stub.createMethodDeclaration(tu, fClassName, fBaseClasses, lineDelimiter); text.append('\t'); text.append(code); @@ -440,8 +439,7 @@ public class NewClassCodeGenerator { if (!protectedMethods.isEmpty()) { text.append("protected:"); //$NON-NLS-1$ text.append(lineDelimiter); - for (Iterator i = protectedMethods.iterator(); i.hasNext();) { - IMethodStub stub = (IMethodStub) i.next(); + for (IMethodStub stub : protectedMethods) { String code = stub.createMethodDeclaration(tu, fClassName, fBaseClasses, lineDelimiter); text.append('\t'); text.append(code); @@ -452,8 +450,7 @@ public class NewClassCodeGenerator { if (!privateMethods.isEmpty()) { text.append("private:"); //$NON-NLS-1$ text.append(lineDelimiter); - for (Iterator i = privateMethods.iterator(); i.hasNext();) { - IMethodStub stub = (IMethodStub) i.next(); + for (IMethodStub stub : privateMethods) { String code = stub.createMethodDeclaration(tu, fClassName, fBaseClasses, lineDelimiter); text.append('\t'); text.append(code); @@ -462,8 +459,8 @@ public class NewClassCodeGenerator { } } - private List getStubs(ASTAccessVisibility access, boolean skipInline) { - List list = new ArrayList(); + private List<IMethodStub> getStubs(ASTAccessVisibility access, boolean skipInline) { + List<IMethodStub> list = new ArrayList<IMethodStub>(); if (fMethodStubs != null) { for (int i = 0; i < fMethodStubs.length; ++i) { IMethodStub stub = fMethodStubs[i]; @@ -508,23 +505,22 @@ public class NewClassCodeGenerator { IPath projectLocation = project.getLocation(); IPath headerLocation = headerTU.getResource().getLocation(); - List includePaths = getIncludePaths(headerTU); - List baseClassPaths = getBaseClassPaths(verifyBaseClasses()); + List<IPath> includePaths = getIncludePaths(headerTU); + List<IPath> baseClassPaths = getBaseClassPaths(verifyBaseClasses()); // add the missing include paths to the project if (createIncludePaths()) { - List newIncludePaths = getMissingIncludePaths(projectLocation, includePaths, baseClassPaths); + List<IPath> newIncludePaths = getMissingIncludePaths(projectLocation, includePaths, baseClassPaths); if (!newIncludePaths.isEmpty()) { addIncludePaths(cProject, newIncludePaths, monitor); } } - List systemIncludes = new ArrayList(); - List localIncludes = new ArrayList(); + List<IPath> systemIncludes = new ArrayList<IPath>(); + List<IPath> localIncludes = new ArrayList<IPath>(); // sort the include paths into system and local - for (Iterator bcIter = baseClassPaths.iterator(); bcIter.hasNext(); ) { - IPath baseClassLocation = (IPath) bcIter.next(); + for (IPath baseClassLocation : baseClassPaths) { boolean isSystemIncludePath = false; IPath includePath = PathUtil.makeRelativePathToProjectIncludes(baseClassLocation, project); @@ -547,9 +543,8 @@ public class NewClassCodeGenerator { } // write the system include paths, e.g. #include <header.h> - for (Iterator i = systemIncludes.iterator(); i.hasNext(); ) { - IPath includePath = (IPath) i.next(); - if (!(headerTU.getElementName().equals(includePath.toString()))) { + for (IPath includePath : systemIncludes) { + if (!(headerTU.getElementName().equals(includePath.toString()))) { String include = getIncludeString(includePath.toString(), true); text.append(include); text.append(lineDelimiter); @@ -557,9 +552,8 @@ public class NewClassCodeGenerator { } // write the local include paths, e.g. #include "header.h" - for (Iterator i = localIncludes.iterator(); i.hasNext(); ) { - IPath includePath = (IPath) i.next(); - if (!(headerTU.getElementName().equals(includePath.toString()))) { + for (IPath includePath : localIncludes) { + if (!(headerTU.getElementName().equals(includePath.toString()))) { String include = getIncludeString(includePath.toString(), false); text.append(include); text.append(lineDelimiter); @@ -587,14 +581,14 @@ public class NewClassCodeGenerator { return NewClassWizardPrefs.createIncludePaths(); } - private void addIncludePaths(ICProject cProject, List newIncludePaths, IProgressMonitor monitor) throws CodeGeneratorException { + private void addIncludePaths(ICProject cProject, List<IPath> newIncludePaths, IProgressMonitor monitor) throws CodeGeneratorException { monitor.beginTask(NewClassWizardMessages.getString("NewClassCodeGeneration.createType.task.header.addIncludePaths"), 100); //$NON-NLS-1$ //TODO prefs option whether to add to project or parent source folder? IPath addToResourcePath = cProject.getPath(); try { - List pathEntryList = new ArrayList(); - List checkEntryList = new ArrayList(); + List<IPathEntry> pathEntryList = new ArrayList<IPathEntry>(); + List<IPathEntry> checkEntryList = new ArrayList<IPathEntry>(); IPathEntry[] checkEntries = cProject.getResolvedPathEntries(); IPathEntry[] pathEntries = cProject.getRawPathEntries(); @@ -603,14 +597,12 @@ public class NewClassCodeGenerator { pathEntryList.add(pathEntries[i]); } } - for (int i=0; i < checkEntries.length; i++) { - if (checkEntries[i] instanceof IIncludeEntry) - checkEntryList.add(checkEntries[i]); + for (IPathEntry checkEntrie : checkEntries) { + if (checkEntrie instanceof IIncludeEntry) + checkEntryList.add(checkEntrie); } - for (Iterator ipIter = newIncludePaths.iterator(); ipIter.hasNext(); ) { - IPath folderToAdd = (IPath) ipIter.next(); - + for (IPath folderToAdd : newIncludePaths) { // do not add any #includes that are local to the project if (cProject.getPath().segment(0).equals(folderToAdd.segment(0))) continue; @@ -624,7 +616,7 @@ public class NewClassCodeGenerator { pathEntryList.add(entry); } } - pathEntries = (IPathEntry[]) pathEntryList.toArray(new IPathEntry[pathEntryList.size()]); + pathEntries = pathEntryList.toArray(new IPathEntry[pathEntryList.size()]); cProject.setRawPathEntries(pathEntries, new SubProgressMonitor(monitor, 80)); } catch (CModelException e) { throw new CodeGeneratorException(e); @@ -632,12 +624,10 @@ public class NewClassCodeGenerator { monitor.done(); } - private List getMissingIncludePaths(IPath projectLocation, List includePaths, List baseClassPaths) { + private List<IPath> getMissingIncludePaths(IPath projectLocation, List<IPath> includePaths, List<IPath> baseClassPaths) { // check for missing include paths - List newIncludePaths = new ArrayList(); - for (Iterator bcIter = baseClassPaths.iterator(); bcIter.hasNext(); ) { - IPath baseClassLocation = (IPath) bcIter.next(); - + List<IPath> newIncludePaths = new ArrayList<IPath>(); + for (IPath baseClassLocation : baseClassPaths) { // skip any paths inside the same project //TODO possibly a preferences option? if (projectLocation.isPrefixOf(baseClassLocation)) { @@ -650,9 +640,8 @@ public class NewClassCodeGenerator { folderToAdd = canonPath; // see if folder or its parent hasn't already been added - for (Iterator newIter = newIncludePaths.iterator(); newIter.hasNext(); ) { - IPath newFolder = (IPath) newIter.next(); - if (newFolder.isPrefixOf(folderToAdd)) { + for (IPath newFolder : newIncludePaths) { + if (newFolder.isPrefixOf(folderToAdd)) { folderToAdd = null; break; } @@ -661,17 +650,16 @@ public class NewClassCodeGenerator { if (folderToAdd != null) { // search include paths boolean foundPath = false; - for (Iterator ipIter = includePaths.iterator(); ipIter.hasNext(); ) { - IPath includePath = (IPath) ipIter.next(); - if (includePath.isPrefixOf(folderToAdd) || includePath.equals(folderToAdd)) { + for (IPath includePath : includePaths) { + if (includePath.isPrefixOf(folderToAdd) || includePath.equals(folderToAdd)) { foundPath = true; break; } } if (!foundPath) { // remove any children of this folder - for (Iterator newIter = newIncludePaths.iterator(); newIter.hasNext(); ) { - IPath newFolder = (IPath) newIter.next(); + for (Iterator<IPath> newIter = newIncludePaths.iterator(); newIter.hasNext(); ) { + IPath newFolder = newIter.next(); if (folderToAdd.isPrefixOf(newFolder)) { newIter.remove(); } @@ -685,7 +673,7 @@ public class NewClassCodeGenerator { return newIncludePaths; } - private List getIncludePaths(ITranslationUnit headerTU) throws CodeGeneratorException { + private List<IPath> getIncludePaths(ITranslationUnit headerTU) throws CodeGeneratorException { IProject project = headerTU.getCProject().getProject(); // get the parent source folder ICContainer sourceFolder = CModelUtil.getSourceFolder(headerTU); @@ -700,7 +688,7 @@ public class NewClassCodeGenerator { if (info != null) { String[] includePaths = info.getIncludePaths(); if (includePaths != null) { - List list = new ArrayList(); + List<IPath> list = new ArrayList<IPath>(); for (int i = 0; i < includePaths.length; ++i) { //TODO do we need to canonicalize these paths first? IPath path = new Path(includePaths[i]); @@ -715,8 +703,8 @@ public class NewClassCodeGenerator { return null; } - private List getBaseClassPaths(boolean verifyLocation) throws CodeGeneratorException { - List list = new ArrayList(); + private List<IPath> getBaseClassPaths(boolean verifyLocation) throws CodeGeneratorException { + List<IPath> list = new ArrayList<IPath>(); for (int i = 0; i < fBaseClasses.length; ++i) { IBaseClassInfo baseClass = fBaseClasses[i]; ITypeReference ref = baseClass.getType().getResolvedReference(); @@ -736,7 +724,7 @@ public class NewClassCodeGenerator { return list; } - public String constructSourceFileContent(ITranslationUnit sourceTU, ITranslationUnit headerTU, List publicMethods, List protectedMethods, List privateMethods, String oldContents, IProgressMonitor monitor) throws CoreException { + public String constructSourceFileContent(ITranslationUnit sourceTU, ITranslationUnit headerTU, List<IMethodStub> publicMethods, List<IMethodStub> protectedMethods, List<IMethodStub> privateMethods, String oldContents, IProgressMonitor monitor) throws CoreException { monitor.beginTask(NewClassWizardMessages.getString("NewClassCodeGeneration.createType.task.source"), 150); //$NON-NLS-1$ String lineDelimiter= StubUtility.getLineDelimiterUsed(sourceTU); @@ -893,10 +881,10 @@ public class NewClassCodeGenerator { return -1; } - private void addMethodBodies(ITranslationUnit tu, List publicMethods, List protectedMethods, List privateMethods, StringBuffer text, String lineDelimiter, IProgressMonitor monitor) throws CoreException { + private void addMethodBodies(ITranslationUnit tu, List<IMethodStub> publicMethods, List<IMethodStub> protectedMethods, List<IMethodStub> privateMethods, StringBuffer text, String lineDelimiter, IProgressMonitor monitor) throws CoreException { if (!publicMethods.isEmpty()) { - for (Iterator i = publicMethods.iterator(); i.hasNext();) { - IMethodStub stub = (IMethodStub) i.next(); + for (Iterator<IMethodStub> i = publicMethods.iterator(); i.hasNext();) { + IMethodStub stub = i.next(); String code = stub.createMethodImplementation(tu, fClassName, fBaseClasses, lineDelimiter); text.append(code); text.append(lineDelimiter); @@ -906,8 +894,8 @@ public class NewClassCodeGenerator { } if (!protectedMethods.isEmpty()) { - for (Iterator i = protectedMethods.iterator(); i.hasNext();) { - IMethodStub stub = (IMethodStub) i.next(); + for (Iterator<IMethodStub> i = protectedMethods.iterator(); i.hasNext();) { + IMethodStub stub = i.next(); String code = stub.createMethodImplementation(tu, fClassName, fBaseClasses, lineDelimiter); text.append(code); text.append(lineDelimiter); @@ -917,8 +905,8 @@ public class NewClassCodeGenerator { } if (!privateMethods.isEmpty()) { - for (Iterator i = privateMethods.iterator(); i.hasNext();) { - IMethodStub stub = (IMethodStub) i.next(); + for (Iterator<IMethodStub> i = privateMethods.iterator(); i.hasNext();) { + IMethodStub stub = i.next(); String code = stub.createMethodImplementation(tu, fClassName, fBaseClasses, lineDelimiter); text.append(code); text.append(lineDelimiter); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java index ce55e8f4543..f38b0ae2bb4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java @@ -321,14 +321,14 @@ public class NewClassWizardUtil { IScannerInfo info = provider.getScannerInformation(project); if (info != null) { String[] includePaths = info.getIncludePaths(); - List filteredTypes = new ArrayList(); + List<ITypeInfo> filteredTypes = new ArrayList<ITypeInfo>(); for (int i = 0; i < elements.length; ++i) { ITypeInfo baseType = elements[i]; if (isTypeReachable(baseType, cProject, includePaths)) { filteredTypes.add(baseType); } } - return (ITypeInfo[]) filteredTypes.toArray(new ITypeInfo[filteredTypes.size()]); + return filteredTypes.toArray(new ITypeInfo[filteredTypes.size()]); } } } @@ -386,7 +386,7 @@ public class NewClassWizardUtil { * {@link #SEARCH_MATCH_FOUND_EXACT} or * {@link #SEARCH_MATCH_NOTFOUND}. */ - public static int searchForCppType(IQualifiedTypeName typeName, ICProject project, Class queryType) { + public static int searchForCppType(IQualifiedTypeName typeName, ICProject project, Class<?> queryType) { IIndex index= null; try { if (project != null) { @@ -421,7 +421,7 @@ public class NewClassWizardUtil { //get the fully qualified name of this binding String bindingFullName = CPPVisitor.renderQualifiedName(binding.getQualifiedName()); - Class currentNodeType = binding.getClass(); + Class<? extends ICPPBinding> currentNodeType = binding.getClass(); // full binding if (queryType.isAssignableFrom(currentNodeType)) { if (bindingFullName.equals(fullyQualifiedTypeName)) { @@ -443,10 +443,9 @@ public class NewClassWizardUtil { { if (bindingFullName.equals(fullyQualifiedTypeName)) { return SEARCH_MATCH_FOUND_EXACT_ANOTHER_TYPE; - } else { - // different type , same name , but different name space - sameNameDifferentTypeExists = true; } + // different type , same name , but different name space + sameNameDifferentTypeExists = true; } } if(sameTypeNameExists){ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java index 80f5e6e206e..ffe2df8cbd2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java @@ -12,25 +12,6 @@ package org.eclipse.cdt.internal.ui.wizards.classwizard; import java.util.ArrayList; -import org.eclipse.cdt.core.browser.PathUtil; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICElementVisitor; -import org.eclipse.cdt.core.model.ICModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.internal.corext.util.CModelUtil; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; -import org.eclipse.cdt.ui.CElementContentProvider; -import org.eclipse.cdt.ui.CElementLabelProvider; -import org.eclipse.cdt.ui.CElementSorter; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; @@ -62,6 +43,28 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Tree; import org.eclipse.ui.dialogs.SelectionStatusDialog; +import org.eclipse.cdt.core.browser.PathUtil; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICElementVisitor; +import org.eclipse.cdt.core.model.ICModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.ui.CElementContentProvider; +import org.eclipse.cdt.ui.CElementLabelProvider; +import org.eclipse.cdt.ui.CElementSorter; + +import org.eclipse.cdt.internal.corext.util.CModelUtil; + +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; +import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; + public class SourceFileSelectionDialog extends SelectionStatusDialog { TreeViewer fViewer; @@ -150,7 +153,7 @@ public class SourceFileSelectionDialog extends SelectionStatusDialog { } } - static final Class[] FILTER_TYPES = new Class[] { + static final Class<?>[] FILTER_TYPES = new Class[] { ICModel.class, ICProject.class, ICContainer.class, @@ -196,7 +199,7 @@ public class SourceFileSelectionDialog extends SelectionStatusDialog { fFileNameDialogField.setDialogFieldListener(fFieldsAdapter); fFileNameDialogField.setLabelText(NewClassWizardMessages.getString("SourceFileSelectionDialog.fileName.label")); //$NON-NLS-1$ - setResult(new ArrayList(0)); + setResult(new ArrayList<Object>(0)); setStatusLineAboveButtons(true); int shellStyle = getShellStyle(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java index cf7922bb43d..8ee475dbf19 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java @@ -219,14 +219,14 @@ public abstract class AbstractFileCreationWizardPage extends NewElementWizardPag protected void editTemplates() { String prefPageId= CodeTemplatePreferencePage.PREF_ID; - Map data= null; + Map<String, String> data= null; String templateName= null; Template template= getSelectedTemplate(); if (template != null) { templateName= template.getName(); } if (templateName != null) { - data= new HashMap(); + data= new HashMap<String, String>(); data.put(CodeTemplatePreferencePage.DATA_SELECT_TEMPLATE, templateName); } PreferenceDialog dialog= PreferencesUtil.createPreferenceDialogOn(getShell(), prefPageId, new String[] { prefPageId }, data); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java index a1d54c7b9dd..102b9215add 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java @@ -117,14 +117,14 @@ public class WizardNewFileFromTemplateCreationPage extends WizardNewFileCreation protected void editTemplates() { String prefPageId= CodeTemplatePreferencePage.PREF_ID; - Map data= null; + Map<String, String> data= null; String templateName= null; Template template= getSelectedTemplate(); if (template != null) { templateName= template.getName(); } if (templateName != null) { - data= new HashMap(); + data= new HashMap<String, String>(); data.put(CodeTemplatePreferencePage.DATA_SELECT_TEMPLATE, templateName); } PreferenceDialog dialog= PreferencesUtil.createPreferenceDialogOn(getShell(), prefPageId, new String[] { prefPageId }, data); @@ -250,7 +250,7 @@ public class WizardNewFileFromTemplateCreationPage extends WizardNewFileCreation } } IContentType[] contentTypes= matcher.findContentTypesFor(fileName); - List result= new ArrayList(contentTypes.length * 2); + List<String> result= new ArrayList<String>(contentTypes.length * 2); for (int i = 0; i < contentTypes.length; i++) { IContentType contentType = contentTypes[i]; String id= contentType.getId(); @@ -271,7 +271,7 @@ public class WizardNewFileFromTemplateCreationPage extends WizardNewFileCreation if (result.isEmpty()) { result.add(FileTemplateContextType.CONTENTTYPE_TEXT); } - return (String[]) result.toArray(new String[result.size()]); + return result.toArray(new String[result.size()]); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java index b39b76a557a..59c533667ba 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java @@ -172,8 +172,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { try { // find the first C project IProject[] projects= fWorkspaceRoot.getProjects(); - for (int i= 0; i < projects.length; i++) { - IProject proj= projects[i]; + for (IProject proj : projects) { if (proj.hasNature(CProjectNature.C_NATURE_ID) || proj.hasNature(CCProjectNature.CC_NATURE_ID)) { projPath= proj.getFullPath().makeRelative().toString(); break; @@ -475,7 +474,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { // ------------- choose dialogs private IFolder chooseFolder(String title, String message, IPath initialPath) { - Class[] acceptedClasses= new Class[] { IFolder.class }; + Class<?>[] acceptedClasses= new Class<?>[] { IFolder.class }; ISelectionStatusValidator validator= new TypedElementSelectionValidator(acceptedClasses, false); ViewerFilter filter= new TypedViewerFilter(acceptedClasses, null); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java index ef9e39b41da..7812c8f7af9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java @@ -39,7 +39,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Text; @@ -57,7 +56,7 @@ import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; -public class TeamProjectIndexExportWizardPage extends WizardDataTransferPage implements Listener { +public class TeamProjectIndexExportWizardPage extends WizardDataTransferPage { private IStructuredSelection fInitialSelection; private CheckboxTableViewer fProjectViewer; @@ -199,9 +198,9 @@ public class TeamProjectIndexExportWizardPage extends WizardDataTransferPage im ICProject[] projects; try { projects = CoreModel.getDefault().getCModel().getCProjects(); - for (int i = 0; i < projects.length; i++) { - if (projects[i].getProject().isOpen()) { - input.add(projects[i]); + for (ICProject project : projects) { + if (project.getProject().isOpen()) { + input.add(project); } } } catch (CModelException e) { @@ -212,15 +211,15 @@ public class TeamProjectIndexExportWizardPage extends WizardDataTransferPage im private void setupBasedOnInitialSelections() { HashSet<String> names= new HashSet<String>(); - Iterator it = fInitialSelection.iterator(); + Iterator<?> it = fInitialSelection.iterator(); while (it.hasNext()) { IProject project = (IProject) it.next(); names.add(project.getName()); } - Collection prjs= (Collection) fProjectViewer.getInput(); - for (Iterator iterator = prjs.iterator(); iterator.hasNext();) { - ICProject prj = (ICProject) iterator.next(); + Collection<?> prjs= (Collection<?>) fProjectViewer.getInput(); + for (Object element : prjs) { + ICProject prj = (ICProject) element; if (names.contains(prj.getElementName())) { fProjectViewer.setChecked(prj, true); } @@ -308,8 +307,7 @@ public class TeamProjectIndexExportWizardPage extends WizardDataTransferPage im IRunnableWithProgress op= new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { monitor.beginTask("", projects.length); //$NON-NLS-1$ - for (int i = 0; i < projects.length; i++) { - ICProject project = projects[i]; + for (ICProject project : projects) { TeamPDOMExportOperation op= new TeamPDOMExportOperation(project); op.setTargetLocation(dest); try { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPage.java index c66d10eb08a..1639a47b563 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPage.java @@ -13,7 +13,6 @@ package org.eclipse.cdt.internal.ui.workingsets; import java.util.ArrayList; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import org.eclipse.core.resources.IContainer; @@ -180,33 +179,33 @@ public class CElementWorkingSetPage extends WizardPage implements IWorkingSetPag */ public void finish() { String workingSetName= fWorkingSetName.getText(); - ArrayList elements= new ArrayList(10); + ArrayList<Object> elements= new ArrayList<Object>(10); findCheckedElements(elements, fTree.getInput()); if (fWorkingSet == null) { IWorkingSetManager workingSetManager= PlatformUI.getWorkbench().getWorkingSetManager(); - fWorkingSet= workingSetManager.createWorkingSet(workingSetName, (IAdaptable[])elements.toArray(new IAdaptable[elements.size()])); + fWorkingSet= workingSetManager.createWorkingSet(workingSetName, elements.toArray(new IAdaptable[elements.size()])); } else { // Add inaccessible resources IAdaptable[] oldItems= fWorkingSet.getElements(); - HashSet closedWithChildren= new HashSet(elements.size()); - for (int i= 0; i < oldItems.length; i++) { + HashSet<IProject> closedWithChildren= new HashSet<IProject>(elements.size()); + for (IAdaptable oldItem : oldItems) { IResource oldResource= null; - if (oldItems[i] instanceof IResource) { - oldResource= (IResource)oldItems[i]; + if (oldItem instanceof IResource) { + oldResource= (IResource)oldItem; } else { - oldResource= (IResource)oldItems[i].getAdapter(IResource.class); + oldResource= (IResource)oldItem.getAdapter(IResource.class); } if (oldResource != null && oldResource.isAccessible() == false) { IProject project= oldResource.getProject(); if (closedWithChildren.contains(project) || elements.contains(project)) { - elements.add(oldItems[i]); + elements.add(oldItem); elements.remove(project); closedWithChildren.add(project); } } } fWorkingSet.setName(workingSetName); - fWorkingSet.setElements((IAdaptable[]) elements.toArray(new IAdaptable[elements.size()])); + fWorkingSet.setElements(elements.toArray(new IAdaptable[elements.size()])); } } @@ -333,9 +332,8 @@ public class CElementWorkingSetPage extends WizardPage implements IWorkingSetPag } } fTree.setCheckedElements(elements); - HashSet parents = new HashSet(); - for (int i= 0; i < elements.length; i++) { - Object element= elements[i]; + HashSet<Object> parents = new HashSet<Object>(); + for (Object element : elements) { if (isExpandable(element)) setSubtreeChecked(element, true, true); @@ -349,8 +347,8 @@ public class CElementWorkingSetPage extends WizardPage implements IWorkingSetPag parents.add(parent); } - for (Iterator i = parents.iterator(); i.hasNext();) - updateObjectState(i.next(), true); + for (Object object : parents) + updateObjectState(object, true); } }); } @@ -417,16 +415,15 @@ public class CElementWorkingSetPage extends WizardPage implements IWorkingSetPag fFirstCheck= false; return; } - else - errorMessage = WorkingSetMessages.getString("CElementWorkingSetPage.warning.nameMustNotBeEmpty"); //$NON-NLS-1$ + errorMessage = WorkingSetMessages.getString("CElementWorkingSetPage.warning.nameMustNotBeEmpty"); //$NON-NLS-1$ } 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 (newText.equals(workingSets[i].getName())) { + for (IWorkingSet workingSet : workingSets) { + if (newText.equals(workingSet.getName())) { errorMessage = WorkingSetMessages.getString("CElementWorkingSetPage.warning.workingSetExists"); //$NON-NLS-1$ } } @@ -446,13 +443,13 @@ public class CElementWorkingSetPage extends WizardPage implements IWorkingSetPag * @param checkedElements the output, list of checked elements * @param parent the parent to collect checked elements in */ - private void findCheckedElements(List checkedElements, Object parent) { + private void findCheckedElements(List<Object> checkedElements, Object parent) { Object[] children= fTreeContentProvider.getChildren(parent); - for (int i= 0; i < children.length; i++) { - if (fTree.getGrayed(children[i])) - findCheckedElements(checkedElements, children[i]); - else if (fTree.getChecked(children[i])) - checkedElements.add(children[i]); + for (Object element : children) { + if (fTree.getGrayed(element)) + findCheckedElements(checkedElements, element); + else if (fTree.getChecked(element)) + checkedElements.add(element); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java index cf0f0344ade..db268745458 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java @@ -18,6 +18,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.internal.ui.BaseCElementContentProvider; @@ -31,7 +32,7 @@ class CElementWorkingSetPageContentProvider extends BaseCElementContentProvider if (element instanceof IWorkspaceRoot) { IWorkspaceRoot root = (IWorkspaceRoot)element; IProject[] projects = root.getProjects(); - List list = new ArrayList(projects.length); + List<ICProject> list = new ArrayList<ICProject>(projects.length); for (int i = 0; i < projects.length; i++) { if (CoreModel.hasCNature(projects[i])) { list.add(CoreModel.getDefault().create(projects[i])); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java index 890228ee2c9..87fe89bd028 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java @@ -71,16 +71,16 @@ public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementCh public static final String ID= "org.eclipse.cdt.ui.CElementWorkingSetPage"; //$NON-NLS-1$ - private List fWorkingSets; + private List<IWorkingSet> fWorkingSets; private static class WorkingSetDelta { private IWorkingSet fWorkingSet; - private List fElements; + private List<Object> fElements; private boolean fChanged; public WorkingSetDelta(IWorkingSet workingSet) { fWorkingSet= workingSet; synchronized (fWorkingSet) { - fElements= new ArrayList(Arrays.asList(fWorkingSet.getElements())); + fElements= new ArrayList<Object>(Arrays.asList(fWorkingSet.getElements())); } } public int indexOf(Object element) { @@ -101,13 +101,13 @@ public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementCh } public void process() { if (fChanged) { - fWorkingSet.setElements((IAdaptable[])fElements.toArray(new IAdaptable[fElements.size()])); + fWorkingSet.setElements(fElements.toArray(new IAdaptable[fElements.size()])); } } } public CElementWorkingSetUpdater() { - fWorkingSets= new ArrayList(); + fWorkingSets= new ArrayList<IWorkingSet>(); CoreModel.getDefault().addElementChangedListener(this); } @@ -168,7 +168,7 @@ public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementCh public void elementChanged(ElementChangedEvent event) { IWorkingSet[] workingSets; synchronized(fWorkingSets) { - workingSets= (IWorkingSet[])fWorkingSets.toArray(new IWorkingSet[fWorkingSets.size()]); + workingSets= fWorkingSets.toArray(new IWorkingSet[fWorkingSets.size()]); } for (int w= 0; w < workingSets.length; w++) { WorkingSetDelta workingSetDelta= new WorkingSetDelta(workingSets[w]); @@ -262,10 +262,10 @@ public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementCh } private static void checkElementExistence(IWorkingSet workingSet) { - List elements= new ArrayList(Arrays.asList(workingSet.getElements())); + List<IAdaptable> elements= new ArrayList<IAdaptable>(Arrays.asList(workingSet.getElements())); boolean changed= false; - for (Iterator iter= elements.iterator(); iter.hasNext();) { - IAdaptable element= (IAdaptable)iter.next(); + for (Iterator<IAdaptable> iter= elements.iterator(); iter.hasNext();) { + IAdaptable element= iter.next(); boolean remove= false; if (element instanceof ICElement) { ICElement cElement= (ICElement)element; @@ -299,7 +299,7 @@ public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementCh } } if (changed) { - workingSet.setElements((IAdaptable[])elements.toArray(new IAdaptable[elements.size()])); + workingSet.setElements(elements.toArray(new IAdaptable[elements.size()])); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetComparator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetComparator.java deleted file mode 100644 index f8ab1b73da8..00000000000 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetComparator.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2006 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.ui.workingsets; - -import java.text.Collator; -import java.util.Comparator; - -import org.eclipse.ui.IWorkingSet; - -class WorkingSetComparator implements Comparator { - - private Collator fCollator= Collator.getInstance(); - - /* - * @see Comparator#compare(Object, Object) - */ - public int compare(Object o1, Object o2) { - String name1= null; - String name2= null; - - if (o1 instanceof IWorkingSet) - name1= ((IWorkingSet)o1).getName(); - - if (o2 instanceof IWorkingSet) - name2= ((IWorkingSet)o2).getName(); - - return fCollator.compare(name1, name2); - } -} |