diff options
author | Sergey Prigogin | 2016-06-26 04:16:12 +0000 |
---|---|---|
committer | Sergey Prigogin | 2016-07-07 02:36:26 +0000 |
commit | 3f0e65922f1b9b87102041cabd54859f0fc6a957 (patch) | |
tree | 5c3f8d90aa29c88ca3ff8d4193f26f3892c85e45 /bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui | |
parent | ee0fbbbb9b8db634300aaad52f0351bd0f46209f (diff) | |
download | eclipse.platform.team-3f0e65922f1b9b87102041cabd54859f0fc6a957.tar.gz eclipse.platform.team-3f0e65922f1b9b87102041cabd54859f0fc6a957.tar.xz eclipse.platform.team-3f0e65922f1b9b87102041cabd54859f0fc6a957.zip |
Fixed compilation warnings and other code cleanup.
Change-Id: I78f0c2c3bc0c78b48b8a56dcfd480f41c640d3b0
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui')
9 files changed, 58 insertions, 91 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/DefaultUIFileModificationValidator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/DefaultUIFileModificationValidator.java index db8446cfc..8735f221b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/DefaultUIFileModificationValidator.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/DefaultUIFileModificationValidator.java @@ -49,17 +49,11 @@ public class DefaultUIFileModificationValidator extends DefaultFileModificationV setImageKey(DLG_IMG_WARNING); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#createMainDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected void createMainDialogArea(Composite parent) { createWrappingLabel(parent, TeamUIMessages.DefaultUIFileModificationValidator_1); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#createDropDownDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Composite createDropDownDialogArea(Composite parent) { Composite composite = createComposite(parent); @@ -77,33 +71,21 @@ public class DefaultUIFileModificationValidator extends DefaultFileModificationV return composite; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#updateEnablements() - */ @Override protected void updateEnablements() { // Nothing to do } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#includeCancelButton() - */ @Override protected boolean includeCancelButton() { return false; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#includeOkButton() - */ @Override protected boolean includeOkButton() { return false; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, true); @@ -111,23 +93,18 @@ public class DefaultUIFileModificationValidator extends DefaultFileModificationV super.createButtonsForButtonBar(parent); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#buttonPressed(int) - */ @Override protected void buttonPressed(int id) { - if (IDialogConstants.YES_ID == id) + if (IDialogConstants.YES_ID == id) { okPressed(); - else if (IDialogConstants.NO_ID == id) + } else if (IDialogConstants.NO_ID == id) { cancelPressed(); - else + } else { super.buttonPressed(id); + } } } - /* (non-Javadoc) - * @see org.eclipse.team.internal.core.DefaultFileModificationValidator#validateEdit(org.eclipse.core.resources.IFile[], org.eclipse.core.resources.team.FileModificationValidationContext) - */ @Override public IStatus validateEdit(final IFile[] allFiles, FileModificationValidationContext context) { final IFile[] readOnlyFiles = getReadOnlyFiles(allFiles); @@ -182,14 +159,14 @@ public class DefaultUIFileModificationValidator extends DefaultFileModificationV } private IFile[] getReadOnlyFiles(IFile[] files) { - List result = new ArrayList(); + List<IFile> result = new ArrayList<>(); for (int i = 0; i < files.length; i++) { IFile file = files[i]; if (file.isReadOnly()) { result.add(file); } } - return (IFile[]) result.toArray(new IFile[result.size()]); + return result.toArray(new IFile[result.size()]); } protected IStatus setWritable(final IFile[] files) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetContentHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetContentHandler.java index 179d5d703..f8eb922ad 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetContentHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetContentHandler.java @@ -23,16 +23,16 @@ public class ProjectSetContentHandler extends DefaultHandler { boolean inPsf = false; boolean inProvider = false; boolean inProject = false; - Map map; + Map<String, List<String>> map; String id; - List references; + List<String> references; boolean isVersionOne = false; @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException { String elementName = getElementName(namespaceURI, localName, qName); if (elementName.equals("psf")) { //$NON-NLS-1$ - map = new HashMap(); + map = new HashMap<>(); inPsf = true; String version = atts.getValue("version"); //$NON-NLS-1$ isVersionOne = version.equals("1.0"); //$NON-NLS-1$ @@ -43,7 +43,7 @@ public class ProjectSetContentHandler extends DefaultHandler { if (!inPsf) throw new SAXException(TeamUIMessages.ProjectSetContentHandler_Element_provider_must_be_contained_in_element_psf_4); inProvider = true; id = atts.getValue("id"); //$NON-NLS-1$ - references = new ArrayList(); + references = new ArrayList<>(); return; } if (elementName.equals("project")) { //$NON-NLS-1$ @@ -75,7 +75,7 @@ public class ProjectSetContentHandler extends DefaultHandler { } } - public Map getReferences() { + public Map<String, List<String>> getReferences() { return map; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java index 2d692c3bf..89791b619 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java @@ -30,7 +30,6 @@ import org.eclipse.team.internal.core.TeamPlugin; import org.eclipse.ui.*; public class ProjectSetImporter { - /** * Imports a psf file based on a file content. This may be used when psf * file is imported from any other location that local filesystem. @@ -73,7 +72,7 @@ public class ProjectSetImporter { try { String version = xmlMemento.getString("version"); //$NON-NLS-1$ - List newProjects = new ArrayList(); + List<IProject> newProjects = new ArrayList<>(); if (version.equals("1.0")){ //$NON-NLS-1$ IProjectSetSerializer serializer = Team.getProjectSetSerializer("versionOneSerializer"); //$NON-NLS-1$ if (serializer != null) { @@ -83,10 +82,10 @@ public class ProjectSetImporter { } } else { UIProjectSetSerializationContext context = new UIProjectSetSerializationContext(shell, filename); - List errors = new ArrayList(); + List<TeamException> errors = new ArrayList<TeamException>(); IMemento[] providers = xmlMemento.getChildren("provider"); //$NON-NLS-1$ for (int i = 0; i < providers.length; i++) { - ArrayList referenceStrings= new ArrayList(); + ArrayList<String> referenceStrings= new ArrayList<>(); IMemento[] projects = providers[i].getChildren("project"); //$NON-NLS-1$ for (int j = 0; j < projects.length; j++) { referenceStrings.add(projects[j].getString("reference")); //$NON-NLS-1$ @@ -106,7 +105,7 @@ public class ProjectSetImporter { ProjectSetCapability serializer = providerType.getProjectSetCapability(); ProjectSetCapability.ensureBackwardsCompatible(providerType, serializer); if (serializer != null) { - IProject[] allProjects = serializer.addToWorkspace((String[])referenceStrings.toArray(new String[referenceStrings.size()]), context, monitor); + IProject[] allProjects = serializer.addToWorkspace(referenceStrings.toArray(new String[referenceStrings.size()]), context, monitor); if (allProjects != null) newProjects.addAll(Arrays.asList(allProjects)); } @@ -115,7 +114,7 @@ public class ProjectSetImporter { } } if (!errors.isEmpty()) { - TeamException[] exceptions= (TeamException[])errors.toArray(new TeamException[errors.size()]); + TeamException[] exceptions= errors.toArray(new TeamException[errors.size()]); IStatus[] status= new IStatus[exceptions.length]; for (int i= 0; i < exceptions.length; i++) { status[i]= exceptions[i].getStatus(); @@ -185,7 +184,7 @@ public class ProjectSetImporter { } } - return (IProject[]) newProjects.toArray(new IProject[newProjects.size()]); + return newProjects.toArray(new IProject[newProjects.size()]); } catch (TeamException e) { throw new InvocationTargetException(e); } @@ -263,11 +262,11 @@ public class ProjectSetImporter { IAdaptable[] oldElements = oldWs.getElements(); IAdaptable[] newElements = newWs.getElements(); - Set combinedElements = new HashSet(); + Set<IAdaptable> combinedElements = new HashSet<IAdaptable>(); combinedElements.addAll(Arrays.asList(oldElements)); combinedElements.addAll(Arrays.asList(newElements)); - oldWs.setElements((IAdaptable[]) combinedElements.toArray(new IAdaptable[0])); + oldWs.setElements(combinedElements.toArray(new IAdaptable[0])); } private static void replaceWorkingSet(IWorkingSetManager wsManager, IWorkingSet newWs, IWorkingSet oldWs) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java index cb33f75bb..7d58d084a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java @@ -18,8 +18,7 @@ import org.eclipse.jface.util.PropertyChangeEvent; * Helper class for implementing property change handling */ public class PropertyChangeHandler { - - private ListenerList fListeners = new ListenerList(ListenerList.IDENTITY); + private ListenerList<IPropertyChangeListener> fListeners = new ListenerList<IPropertyChangeListener>(ListenerList.IDENTITY); /** * Notifies listeners of property changes, handling any exceptions @@ -77,5 +76,4 @@ public class PropertyChangeHandler { PropertyNotifier notifier = new PropertyNotifier(); notifier.notify(new PropertyChangeEvent(source, property, oldValue, newValue)); } - } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/StorageTypedElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/StorageTypedElement.java index 532033752..b42cf5617 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/StorageTypedElement.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/StorageTypedElement.java @@ -112,11 +112,9 @@ public abstract class StorageTypedElement implements ITypedElement, IEncodedStre return null; } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ + @SuppressWarnings("unchecked") @Override - public Object getAdapter(Class adapter) { + public <T> T getAdapter(Class<T> adapter) { if (adapter == ISharedDocumentAdapter.class) { synchronized (this) { if (sharedDocumentAdapter == null) @@ -133,7 +131,7 @@ public abstract class StorageTypedElement implements ITypedElement, IEncodedStre // The document is read-only } }; - return sharedDocumentAdapter; + return (T) sharedDocumentAdapter; } } return Platform.getAdapterManager().getAdapter(this, adapter); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamAdapterFactory.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamAdapterFactory.java index d03048d82..e917fafcf 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamAdapterFactory.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamAdapterFactory.java @@ -25,56 +25,52 @@ import org.eclipse.team.ui.mapping.ITeamStateProvider; import org.eclipse.ui.model.IWorkbenchAdapter; public class TeamAdapterFactory implements IAdapterFactory { + private static final Class[] ADAPTER_CLASSES = new Class[] { + IWorkbenchAdapter.class, + IResourceMappingMerger.class, + ISynchronizationCompareAdapter.class, + ISynchronizationScopeParticipantFactory.class, + ITeamStateProvider.class , + IFileRevision.class + }; private DiffNodeWorkbenchAdapter diffNodeAdapter = new DiffNodeWorkbenchAdapter(); private static final ISynchronizationCompareAdapter COMPARE_ADAPTER = new ResourceModelPersistenceAdapter(); - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) - */ + @SuppressWarnings("unchecked") @Override - public Object getAdapter(Object adaptableObject, Class adapterType) { + public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) { if(adaptableObject instanceof DiffNode && adapterType == IWorkbenchAdapter.class) { - return diffNodeAdapter; + return (T) diffNodeAdapter; } if (adaptableObject instanceof ModelProvider) { ModelProvider provider = (ModelProvider) adaptableObject; if (provider.getDescriptor().getId().equals(ModelProvider.RESOURCE_MODEL_PROVIDER_ID)) { if (adapterType == IResourceMappingMerger.class) { - return new DefaultResourceMappingMerger((ModelProvider)adaptableObject); + return (T) new DefaultResourceMappingMerger((ModelProvider)adaptableObject); } if (adapterType == ISynchronizationScopeParticipantFactory.class) { - return new ResourceModelScopeParticipantFactory((ModelProvider)adaptableObject); + return (T) new ResourceModelScopeParticipantFactory((ModelProvider)adaptableObject); } } } if (adaptableObject instanceof ModelProvider && adapterType == ISynchronizationCompareAdapter.class) { - return COMPARE_ADAPTER; + return (T) COMPARE_ADAPTER; } if (adaptableObject instanceof RepositoryProviderType && adapterType == ITeamStateProvider.class) { RepositoryProviderType rpt = (RepositoryProviderType) adaptableObject; - return TeamUIPlugin.getPlugin().getDecoratedStateProvider(rpt); + return (T) TeamUIPlugin.getPlugin().getDecoratedStateProvider(rpt); } if (IFileRevision.class == adapterType && adaptableObject instanceof FileRevisionEditorInput) { - return ((FileRevisionEditorInput)adaptableObject).getFileRevision(); + return (T) ((FileRevisionEditorInput) adaptableObject).getFileRevision(); } return null; } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() - */ @Override - public Class[] getAdapterList() { - return new Class[] { - IWorkbenchAdapter.class, - IResourceMappingMerger.class, - ISynchronizationCompareAdapter.class, - ISynchronizationScopeParticipantFactory.class, - ITeamStateProvider.class , - IFileRevision.class - }; + public Class<?>[] getAdapterList() { + return ADAPTER_CLASSES; } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamCapabilityHelper.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamCapabilityHelper.java index ef831317f..3e42775b5 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamCapabilityHelper.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamCapabilityHelper.java @@ -30,12 +30,11 @@ import org.eclipse.ui.activities.*; * @since 3.0 */ public class TeamCapabilityHelper { - /** * Mapping from repository provider id to IPluginContribution. Used for proper * activity mapping of natures. */ - private Map providerIdToPluginId; + private Map<String, IPluginContribution> providerIdToPluginId; /** * Singleton instance. @@ -59,7 +58,7 @@ public class TeamCapabilityHelper { * for workspace changes and promote activities accordingly. */ private TeamCapabilityHelper() { - providerIdToPluginId = new HashMap(); + providerIdToPluginId = new HashMap<String, IPluginContribution>(); loadRepositoryProviderIds(); // crawl the initial projects @@ -134,10 +133,10 @@ public class TeamCapabilityHelper { return; IActivityManager activityManager = workbenchActivitySupport .getActivityManager(); - Set activities = new HashSet(activityManager.getEnabledActivityIds()); + Set activities = new HashSet<>(activityManager.getEnabledActivityIds()); boolean changed = false; - IPluginContribution contribution = (IPluginContribution) providerIdToPluginId.get(id); + IPluginContribution contribution = providerIdToPluginId.get(id); if (contribution == null) return; //bad provider ID. IIdentifier identifier = activityManager.getIdentifier(WorkbenchActivityHelper.createUnifiedId(contribution)); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java index 5f7e4ecf6..a5464bb12 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java @@ -60,18 +60,18 @@ public class TeamUIPlugin extends AbstractUIPlugin { public static final String TRIGGER_POINT_ID = "org.eclipse.team.ui.activityTriggerPoint"; //$NON-NLS-1$ - private static List propertyChangeListeners = new ArrayList(5); + private static List<IPropertyChangeListener> propertyChangeListeners = new ArrayList<IPropertyChangeListener>(5); - private Hashtable imageDescriptors = new Hashtable(20); + private Hashtable<String, ImageDescriptor> imageDescriptors = new Hashtable<String, ImageDescriptor>(20); private WorkspaceTeamStateProvider provider; - private Map decoratedStateProviders = new HashMap(); + private Map<String, TeamStateProvider> decoratedStateProviders = new HashMap<String, TeamStateProvider>(); // manages synchronize participants private SynchronizeManager synchronizeManager; - private ServiceRegistration debugRegistration; + private ServiceRegistration<DebugOptionsListener> debugRegistration; /** * ID of the 'Remove from View' action. @@ -219,7 +219,7 @@ public class TeamUIPlugin extends AbstractUIPlugin { super.start(context); // register debug options listener - Hashtable properties = new Hashtable(2); + Hashtable<String, String> properties = new Hashtable<>(2); properties.put(DebugOptions.LISTENER_SYMBOLICNAME, ID); debugRegistration = context.registerService(DebugOptionsListener.class, Policy.DEBUG_OPTIONS_LISTENER, properties); @@ -271,7 +271,7 @@ public class TeamUIPlugin extends AbstractUIPlugin { if (provider != null) { provider.dispose(); } - for (Iterator iter = decoratedStateProviders.values().iterator(); iter.hasNext();) { + for (Iterator<TeamStateProvider> iter = decoratedStateProviders.values().iterator(); iter.hasNext();) { SubscriberTeamStateProvider sdsp = (SubscriberTeamStateProvider) iter.next(); sdsp.dispose(); } @@ -298,8 +298,8 @@ public class TeamUIPlugin extends AbstractUIPlugin { * @param event the property change event object */ public static void broadcastPropertyChange(PropertyChangeEvent event) { - for (Iterator it = propertyChangeListeners.iterator(); it.hasNext();) { - IPropertyChangeListener listener = (IPropertyChangeListener)it.next(); + for (Iterator<IPropertyChangeListener> it = propertyChangeListeners.iterator(); it.hasNext();) { + IPropertyChangeListener listener = it.next(); listener.propertyChange(event); } } @@ -334,7 +334,7 @@ public class TeamUIPlugin extends AbstractUIPlugin { if(! imageDescriptors.containsKey(id)) { createImageDescriptor(getPlugin(), id); } - return (ImageDescriptor)imageDescriptors.get(id); + return imageDescriptors.get(id); } /** @@ -455,7 +455,7 @@ public class TeamUIPlugin extends AbstractUIPlugin { } public synchronized TeamStateProvider getDecoratedStateProvider(RepositoryProviderType rpt) { - TeamStateProvider provider = (TeamStateProvider)decoratedStateProviders.get(rpt.getID()); + TeamStateProvider provider = decoratedStateProviders.get(rpt.getID()); if (provider != null) return provider; Subscriber subscriber = rpt.getSubscriber(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIProjectSetSerializationContext.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIProjectSetSerializationContext.java index 556fb9d95..f5143a7eb 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIProjectSetSerializationContext.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIProjectSetSerializationContext.java @@ -35,16 +35,16 @@ import org.eclipse.team.internal.ui.dialogs.PromptingDialog; * @since 3.0 */ public class UIProjectSetSerializationContext extends ProjectSetSerializationContext { - /** * The parent shell for this UI context */ private final Shell shell; /** - * Construct a new instance + * Constructs a new instance. * * @param shell The parent shell for this UI context + * @param filename a filename or {@code null} */ public UIProjectSetSerializationContext(Shell shell, String filename) { super(filename); @@ -104,7 +104,7 @@ public class UIProjectSetSerializationContext extends ProjectSetSerializationCon }; PromptingDialog dialog = new PromptingDialog( - (Shell)getShell(), + (Shell) getShell(), projects, prompt, TeamUIMessages.UIProjectSetSerializationContext_1); |