diff options
author | Paul Pazderski | 2019-05-18 14:07:38 +0000 |
---|---|---|
committer | Paul Pazderski | 2019-05-19 23:54:17 +0000 |
commit | de3c0c5ff08c928e6d1eb4fac2704bbb2d261669 (patch) | |
tree | de6e0a11c45731a312b5e239c22387afe93fe19c /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java | |
parent | 5e9e26b1abe5bd1df37faa91fde2d87fd79ed06b (diff) | |
download | eclipse.platform.team-de3c0c5ff08c928e6d1eb4fac2704bbb2d261669.tar.gz eclipse.platform.team-de3c0c5ff08c928e6d1eb4fac2704bbb2d261669.tar.xz eclipse.platform.team-de3c0c5ff08c928e6d1eb4fac2704bbb2d261669.zip |
Bug 547304 - [cleanup] Fix wrong space/tab indentationS4_12_0_RC2S4_12_0_RC1aS4_12_0_RC1S4_12_0_M3R4_12I20190605-1800I20190605-0600I20190604-1800I20190604-0600I20190603-1800I20190603-0600I20190602-1800I20190602-0600I20190601-1800I20190531-1800I20190531-0245I20190529-2005I20190529-1800I20190529-0600I20190528-1800I20190528-0915I20190528-0850I20190528-0600I20190527-1805I20190527-0600I20190526-1800I20190526-0600I20190525-1800I20190525-0600I20190524-1800I20190524-0135I20190522-1800I20190522-0600I20190521-1800I20190521-0600I20190520-1805I20190520-0600R4_12_maintenance
This change fixes space or mixed tab/space indentations in all Java
files. This also includes two or three space indentations and even fix
most stray single spaces in indentations.
The change includes only whitespace formatting and no code changes.
Change-Id: I4149aaf4e48ccf7b49083f36d52e0c7a67433c7d
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java')
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java index 4d44ac5c3..c11210f0b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java @@ -34,9 +34,9 @@ public class ShowAnnotationAction extends WorkspaceAction { * Action to open a CVS Annotate View */ public void execute(IAction action) throws InvocationTargetException, InterruptedException { - final ICVSResource resource= getSingleSelectedCVSResource(); - if (resource == null) - return; + final ICVSResource resource= getSingleSelectedCVSResource(); + if (resource == null) + return; execute(resource); } @@ -52,9 +52,9 @@ public class ShowAnnotationAction extends WorkspaceAction { public void execute(final ICVSResource cvsResource) throws InvocationTargetException, InterruptedException { final String revision= getRevision(cvsResource); if (revision == null) - return; + return; boolean binary = isBinary(cvsResource); - if (binary) { + if (binary) { final IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore(); final String option = store.getString(ICVSUIConstants.PREF_ANNOTATE_PROMPTFORBINARY); if (option.equals(MessageDialogWithToggle.PROMPT)) { @@ -67,24 +67,24 @@ public class ShowAnnotationAction extends WorkspaceAction { } else if (option.equals(MessageDialogWithToggle.NEVER)) return; } - + new ShowAnnotationOperation(getTargetPart(), cvsResource, revision, binary).run(); } - private boolean isBinary(ICVSResource cvsResource) { - if (cvsResource.isFolder()) return false; - - try { - byte[] syncBytes = ((ICVSFile)cvsResource).getSyncBytes(); - if (syncBytes == null) - return false; - return ResourceSyncInfo.isBinary(syncBytes); - } catch (CVSException e) { - return false; - } - } + private boolean isBinary(ICVSResource cvsResource) { + if (cvsResource.isFolder()) return false; + + try { + byte[] syncBytes = ((ICVSFile)cvsResource).getSyncBytes(); + if (syncBytes == null) + return false; + return ResourceSyncInfo.isBinary(syncBytes); + } catch (CVSException e) { + return false; + } + } - /** + /** * Only enabled for single resource selection */ public boolean isEnabled() { @@ -134,7 +134,7 @@ public class ShowAnnotationAction extends WorkspaceAction { return null; } - + /** * Get the revision for the CVS resource. Throws an InvocationTargetException * if the revision could not be determined. @@ -144,16 +144,16 @@ public class ShowAnnotationAction extends WorkspaceAction { * @throws InvocationTargetException */ private String getRevision(ICVSResource cvsResource) throws InvocationTargetException { - final ResourceSyncInfo info; - try { - info= cvsResource.getSyncInfo(); - if (info == null) - throw new CVSException(NLS.bind(CVSUIMessages.ShowAnnotationAction_noSyncInfo, new String[] { cvsResource.getName() })); - } catch (CVSException e) { - throw new InvocationTargetException(e); - } - return info.getRevision(); - } + final ResourceSyncInfo info; + try { + info= cvsResource.getSyncInfo(); + if (info == null) + throw new CVSException(NLS.bind(CVSUIMessages.ShowAnnotationAction_noSyncInfo, new String[] { cvsResource.getName() })); + } catch (CVSException e) { + throw new InvocationTargetException(e); + } + return info.getRevision(); + } public String getId() { return ICVSUIConstants.CMD_ANNOTATE; |