diff options
Diffstat (limited to 'org.eclipse.ui.editors/src/org/eclipse/ui/editors')
5 files changed, 43 insertions, 42 deletions
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java index 965acf01643..79ff070644f 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java @@ -411,11 +411,11 @@ public class EncodingActionGroup extends ActionGroup { editor.setAction(IEncodingActionsConstants.SYSTEM, a); } - for (int i= 0; i < ENCODINGS.length; i++) { - a= new PredefinedEncodingAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ConvertEncoding." + ENCODINGS[i][0] + ".", ENCODINGS[i][0], editor); //$NON-NLS-1$ //$NON-NLS-2$ - a.setHelpContextId( ENCODINGS[i][1]); - a.setActionDefinitionId( ENCODINGS[i][2]); - editor.setAction(ENCODINGS[i][0], a); + for (String[] e : ENCODINGS) { + a = new PredefinedEncodingAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ConvertEncoding." + e[0] + ".", e[0], editor); //$NON-NLS-1$ //$NON-NLS-2$ + a.setHelpContextId(e[1]); + a.setActionDefinitionId(e[2]); + editor.setAction(e[0], a); } a= new CustomEncodingAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ConvertEncoding." + IEncodingActionsConstants.CUSTOM + ".", editor); //$NON-NLS-1$ //$NON-NLS-2$ @@ -435,8 +435,8 @@ public class EncodingActionGroup extends ActionGroup { if (a instanceof IUpdate) ((IUpdate) a).update(); - for (int i= 0; i < ENCODINGS.length; i++) { - a= fTextEditor.getAction(ENCODINGS[i][0]); + for (String[] e : ENCODINGS) { + a = fTextEditor.getAction(e[0]); if (a instanceof IUpdate) ((IUpdate) a).update(); } @@ -450,8 +450,9 @@ public class EncodingActionGroup extends ActionGroup { public void dispose() { if (fTextEditor != null) { fTextEditor.setAction(IEncodingActionsConstants.SYSTEM, null); - for (int i= 0; i < ENCODINGS.length; i++) - fTextEditor.setAction(ENCODINGS[i][0], null); + for (String[] e : ENCODINGS) { + fTextEditor.setAction(e[0], null); + } fTextEditor.setAction(IEncodingActionsConstants.CUSTOM, null); fTextEditor= null; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java index 8789be2cb63..c2798ab3430 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationAction.java @@ -158,8 +158,7 @@ public class FileBufferOperationAction extends Action implements IWorkbenchWindo */ protected IFile[] collectFiles(IResource[] resources) { Set<IResource> files= new HashSet<>(); - for (int i= 0; i < resources.length; i++) { - IResource resource= resources[i]; + for (IResource resource : resources) { if ((IResource.FILE & resource.getType()) > 0) files.add(resource); } @@ -206,8 +205,8 @@ public class FileBufferOperationAction extends Action implements IWorkbenchWindo progressMonitor.beginTask(TextEditorMessages.FileBufferOperationAction_collectionFiles_label, files.length); try { Set<IPath> locations= new HashSet<>(); - for (int i= 0; i < files.length; i++) { - IPath fullPath= files[i].getFullPath(); + for (IFile file : files) { + IPath fullPath = file.getFullPath(); if (isAcceptableLocation(fullPath)) locations.add(fullPath); progressMonitor.worked(1); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationHandler.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationHandler.java index d05ae47bdb9..b092b806f3c 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationHandler.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileBufferOperationHandler.java @@ -174,8 +174,7 @@ public class FileBufferOperationHandler extends AbstractHandler { */ protected IFile[] collectFiles(IResource[] resources) { Set<IResource> files= new HashSet<>(); - for (int i= 0; i < resources.length; i++) { - IResource resource= resources[i]; + for (IResource resource : resources) { if ((IResource.FILE & resource.getType()) > 0) files.add(resource); } @@ -246,8 +245,8 @@ public class FileBufferOperationHandler extends AbstractHandler { progressMonitor.beginTask(TextEditorMessages.FileBufferOperationHandler_collectionFiles_label, files.length); try { Set<IPath> locations= new HashSet<>(); - for (int i= 0; i < files.length; i++) { - IPath fullPath= files[i].getFullPath(); + for (IFile file : files) { + IPath fullPath = file.getFullPath(); if (isAcceptableLocation(fullPath)) locations.add(fullPath); progressMonitor.worked(1); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry.java index ac9309a950f..4c2ac4fe7f4 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionContextTypeRegistry.java @@ -90,14 +90,15 @@ public class ContributionContextTypeRegistry extends ContextTypeRegistry { IConfigurationElement[] extensions= getTemplateExtensions(); - for (int i= 0; i < extensions.length; i++) { - if (extensions[i].getName().equals(REGISTRY)) { - String id= extensions[i].getAttribute(ID); + for (IConfigurationElement extension : extensions) { + if (extension.getName().equals(REGISTRY)) { + String id = extension.getAttribute(ID); if (registryId.equals(id)) { - for (int j= 0; j < extensions.length; j++) { - if (extensions[j].getName().equals(CONTEXT_TYPE)) { - if (registryId.equals(extensions[j].getAttribute(REGISTRY_ID))) - addContextType(extensions[j].getAttribute(ID)); + for (IConfigurationElement extension2 : extensions) { + if (extension2.getName().equals(CONTEXT_TYPE)) { + if (registryId.equals(extension2.getAttribute(REGISTRY_ID))) { + addContextType(extension2.getAttribute(ID)); + } } } return; @@ -150,8 +151,9 @@ public class ContributionContextTypeRegistry extends ContextTypeRegistry { type= createContextType(extensions, id); if (type != null) { TemplateVariableResolver[] resolvers= createResolvers(extensions, id); - for (int i= 0; i < resolvers.length; i++) - type.addResolver(resolvers[i]); + for (TemplateVariableResolver resolver : resolvers) { + type.addResolver(resolver); + } } } catch (CoreException e) { EditorsPlugin.log(e); @@ -162,12 +164,13 @@ public class ContributionContextTypeRegistry extends ContextTypeRegistry { } private static TemplateContextType createContextType(IConfigurationElement[] extensions, String contextTypeId) throws CoreException { - for (int i= 0; i < extensions.length; i++) { + for (IConfigurationElement extension : extensions) { // TODO create half-order over contributions - if (extensions[i].getName().equals(CONTEXT_TYPE)) { - String id= extensions[i].getAttribute(ID); - if (contextTypeId.equals(id)) - return createContextType(extensions[i]); + if (extension.getName().equals(CONTEXT_TYPE)) { + String id = extension.getAttribute(ID); + if (contextTypeId.equals(id)) { + return createContextType(extension); + } } } @@ -186,12 +189,12 @@ public class ContributionContextTypeRegistry extends ContextTypeRegistry { */ private static TemplateVariableResolver[] createResolvers(IConfigurationElement[] extensions, String contextTypeId) { List<TemplateVariableResolver> resolvers= new ArrayList<>(); - for (int i= 0; i < extensions.length; i++) { - if (extensions[i].getName().equals(RESOLVER)) { - String declaredId= extensions[i].getAttribute(CONTEXT_TYPE_ID); + for (IConfigurationElement extension : extensions) { + if (extension.getName().equals(RESOLVER)) { + String declaredId = extension.getAttribute(CONTEXT_TYPE_ID); if (contextTypeId.equals(declaredId)) { try { - TemplateVariableResolver resolver= createResolver(extensions[i]); + TemplateVariableResolver resolver = createResolver(extension); if (resolver != null) resolvers.add(resolver); } catch (CoreException e) { diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java index ba64a531f65..5b81e1d3147 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java @@ -118,11 +118,11 @@ public class ContributionTemplateStore extends TemplateStore { private Collection<TemplatePersistenceData> readContributedTemplates(IConfigurationElement[] extensions) throws IOException { Collection<TemplatePersistenceData> templates= new ArrayList<>(); - for (int i= 0; i < extensions.length; i++) { - if (extensions[i].getName().equals(TEMPLATE)) - createTemplate(templates, extensions[i]); - else if (extensions[i].getName().equals(INCLUDE)) { - readIncludedTemplates(templates, extensions[i]); + for (IConfigurationElement extension : extensions) { + if (extension.getName().equals(TEMPLATE)) { + createTemplate(templates, extension); + } else if (extension.getName().equals(INCLUDE)) { + readIncludedTemplates(templates, extension); } } @@ -149,8 +149,7 @@ public class ContributionTemplateStore extends TemplateStore { try (InputStream stream= new BufferedInputStream(url.openStream())) { TemplateReaderWriter reader= new TemplateReaderWriter(); TemplatePersistenceData[] datas= reader.read(stream, bundle); - for (int i= 0; i < datas.length; i++) { - TemplatePersistenceData data= datas[i]; + for (TemplatePersistenceData data : datas) { if (data.isCustom()) { if (data.getId() == null) EditorsPlugin.logErrorMessage(NLSUtility.format(ContributionTemplateMessages.ContributionTemplateStore_ignore_no_id, data.getTemplate().getName())); |