diff options
author | Paul Pazderski | 2019-05-18 21:39:58 +0000 |
---|---|---|
committer | Paul Pazderski | 2019-05-19 23:44:04 +0000 |
commit | 8bc461175ceded9ec872cff17d84fbce8fc4795d (patch) | |
tree | 341effbc5c46d3376180e05cefa509d7d4ec270b /org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java | |
parent | 9e7f66919496659795478f8cd80804da71498fff (diff) | |
download | eclipse.platform.text-8bc461175ceded9ec872cff17d84fbce8fc4795d.tar.gz eclipse.platform.text-8bc461175ceded9ec872cff17d84fbce8fc4795d.tar.xz eclipse.platform.text-8bc461175ceded9ec872cff17d84fbce8fc4795d.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: I3e7b6abb69a1894c402f9123417346a44fc0992a
Diffstat (limited to 'org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java')
-rw-r--r-- | org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java | 216 |
1 files changed, 108 insertions, 108 deletions
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java index 9d2655dc90a..a4c43e67aae 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java @@ -63,16 +63,16 @@ class AdditionalInfoController extends AbstractInformationControlManager { /** * @return the delay in milliseconds before this task should be run */ - public abstract long delay(); - /** - * Runs this task. - */ - @Override + public abstract long delay(); + /** + * Runs this task. + */ + @Override public abstract void run(); - /** - * @return the task to be scheduled after this task has been run - */ - public abstract Task nextTask(); + /** + * @return the task to be scheduled after this task has been run + */ + public abstract Task nextTask(); } /** @@ -88,7 +88,7 @@ class AdditionalInfoController extends AbstractInformationControlManager { @Override public Task nextTask() { Assert.isTrue(false); - return null; + return null; } @Override @@ -112,15 +112,15 @@ class AdditionalInfoController extends AbstractInformationControlManager { @Override protected IStatus run(IProgressMonitor monitor) { Object info; - try { - info= proposal.getAdditionalProposalInfo(monitor); - } catch (RuntimeException x) { - /* + try { + info= proposal.getAdditionalProposalInfo(monitor); + } catch (RuntimeException x) { + /* * XXX: This is the safest fix at this point so close to end of 3.2. * Will be revisited when fixing https://bugs.eclipse.org/bugs/show_bug.cgi?id=101033 - */ - return new Status(IStatus.WARNING, "org.eclipse.jface.text", IStatus.OK, "", x); //$NON-NLS-1$ //$NON-NLS-2$ - } + */ + return new Status(IStatus.WARNING, "org.eclipse.jface.text", IStatus.OK, "", x); //$NON-NLS-1$ //$NON-NLS-2$ + } setInfo((ICompletionProposal) proposal, info); return Status.OK_STATUS; } @@ -200,7 +200,7 @@ class AdditionalInfoController extends AbstractInformationControlManager { @Override public String toString() { - return "LEGACY_WAIT"; //$NON-NLS-1$ + return "LEGACY_WAIT"; //$NON-NLS-1$ } }; /** @@ -209,19 +209,19 @@ class AdditionalInfoController extends AbstractInformationControlManager { private final Task EXIT= new Task() { @Override public long delay() { - return 1; - } + return 1; + } @Override public Task nextTask() { Assert.isTrue(false); - return EXIT; - } + return EXIT; + } @Override public void run() { Assert.isTrue(false); - } + } @Override public String toString() { @@ -251,10 +251,10 @@ class AdditionalInfoController extends AbstractInformationControlManager { * @param delay the delay until to show additional info */ public Timer(Display display, int delay) { - fDisplay= display; + fDisplay= display; fDelay= delay; long current= System.currentTimeMillis(); - schedule(IDLE, current); + schedule(IDLE, current); fThread= new Thread((Runnable) () -> { try { @@ -292,68 +292,68 @@ class AdditionalInfoController extends AbstractInformationControlManager { } } - private Task taskOnReset(ICompletionProposal p) { + private Task taskOnReset(ICompletionProposal p) { if (p == null) return IDLE; if (isExt5(p)) return FIRST_WAIT; return LEGACY_WAIT; - } - - private synchronized void loop() throws InterruptedException { - long current= System.currentTimeMillis(); - Task task= currentTask(); - - while (task != EXIT) { - long delay= fNextWakeup - current; - if (delay <= 0) { - task.run(); - task= task.nextTask(); - schedule(task, current); - } else { - wait(delay); - current= System.currentTimeMillis(); - task= currentTask(); - } - } - } - - private Task currentTask() { - return fTask; - } - - private void schedule(Task task, long current) { - fTask= task; - long nextWakeup= current + task.delay(); - if (nextWakeup <= current) - fNextWakeup= Long.MAX_VALUE; - else - fNextWakeup= nextWakeup; - } + } + + private synchronized void loop() throws InterruptedException { + long current= System.currentTimeMillis(); + Task task= currentTask(); + + while (task != EXIT) { + long delay= fNextWakeup - current; + if (delay <= 0) { + task.run(); + task= task.nextTask(); + schedule(task, current); + } else { + wait(delay); + current= System.currentTimeMillis(); + task= currentTask(); + } + } + } + + private Task currentTask() { + return fTask; + } + + private void schedule(Task task, long current) { + fTask= task; + long nextWakeup= current + task.delay(); + if (nextWakeup <= current) + fNextWakeup= Long.MAX_VALUE; + else + fNextWakeup= nextWakeup; + } private boolean isExt5(ICompletionProposal p) { return p instanceof ICompletionProposalExtension5; } - ICompletionProposal getCurrentProposal() { - return fCurrentProposal; - } - - ICompletionProposalExtension5 getCurrentProposalEx() { - Assert.isTrue(fCurrentProposal instanceof ICompletionProposalExtension5); - return (ICompletionProposalExtension5) fCurrentProposal; - } - - synchronized void setInfo(ICompletionProposal proposal, Object info) { - if (proposal == fCurrentProposal) { - fCurrentInfo= info; - if (fAllowShowing) { - triggerShowing(); - } - } - } - - private void triggerShowing() { + ICompletionProposal getCurrentProposal() { + return fCurrentProposal; + } + + ICompletionProposalExtension5 getCurrentProposalEx() { + Assert.isTrue(fCurrentProposal instanceof ICompletionProposalExtension5); + return (ICompletionProposalExtension5) fCurrentProposal; + } + + synchronized void setInfo(ICompletionProposal proposal, Object info) { + if (proposal == fCurrentProposal) { + fCurrentInfo= info; + if (fAllowShowing) { + triggerShowing(); + } + } + } + + private void triggerShowing() { final Object info= fCurrentInfo; if (!fDisplay.isDisposed()) { fDisplay.asyncExec(() -> { @@ -364,20 +364,20 @@ class AdditionalInfoController extends AbstractInformationControlManager { } }); } - } - - /** - * Called in the display thread to show additional info. - * - * @param proposal the proposal to show information about - * @param info the information about <code>proposal</code> - */ - protected abstract void showInformation(ICompletionProposal proposal, Object info); - - void allowShowing() { - fAllowShowing= true; - triggerShowing(); - } + } + + /** + * Called in the display thread to show additional info. + * + * @param proposal the proposal to show information about + * @param info the information about <code>proposal</code> + */ + protected abstract void showInformation(ICompletionProposal proposal, Object info); + + void allowShowing() { + fAllowShowing= true; + triggerShowing(); + } } /** * Internal table selection listener. @@ -441,12 +441,12 @@ class AdditionalInfoController extends AbstractInformationControlManager { setAnchor(ANCHOR_RIGHT); setFallbackAnchors(new Anchor[] { ANCHOR_RIGHT, ANCHOR_LEFT, ANCHOR_BOTTOM }); - /* + /* * Adjust the location by one pixel towards the proposal popup, so that the single pixel * border of the additional info popup overlays with the border of the popup. This avoids * having a double black line. */ - int spacing= -1; + int spacing= -1; setMargins(spacing, spacing); // see also adjustment in #computeLocation InformationControlReplacer replacer= new InformationControlReplacer(new DefaultPresenterControlCreator()); @@ -525,10 +525,10 @@ class AdditionalInfoController extends AbstractInformationControlManager { if (fProposal == proposal && ((info == null && fInformation == null) || (info != null && info.equals(fInformation)))) return; - fInformation= info; - fProposal= proposal; - showInformation(); - } + fInformation= info; + fProposal= proposal; + showInformation(); + } @Override protected void computeInformation() { @@ -546,16 +546,16 @@ class AdditionalInfoController extends AbstractInformationControlManager { @Override protected Point computeLocation(Rectangle subjectArea, Point controlSize, Anchor anchor) { - Point location= super.computeLocation(subjectArea, controlSize, anchor); + Point location= super.computeLocation(subjectArea, controlSize, anchor); - /* + /* * The location is computed using subjectControl.toDisplay(), which does not include the * trim of the subject control. As we want the additional info popup aligned with the outer * coordinates of the proposal popup, adjust this here */ - Rectangle trim= fProposalTable.getShell().computeTrim(0, 0, 0, 0); - location.x += trim.x; - location.y += trim.y; + Rectangle trim= fProposalTable.getShell().computeTrim(0, 0, 0, 0); + location.x += trim.x; + location.y += trim.y; return location; } @@ -566,14 +566,14 @@ class AdditionalInfoController extends AbstractInformationControlManager { Point sizeConstraint= super.computeSizeConstraints(subjectControl, informationControl); Point size= subjectControl.getShell().getSize(); - // AbstractInformationControlManager#internalShowInformationControl(Rectangle, Object) adds trims + // AbstractInformationControlManager#internalShowInformationControl(Rectangle, Object) adds trims // to the computed constraints. Need to remove them here, to make the outer bounds of the additional // info shell fit the bounds of the proposal shell: - if (fInformationControl instanceof IInformationControlExtension3) { - Rectangle shellTrim= ((IInformationControlExtension3) fInformationControl).computeTrim(); - size.x -= shellTrim.width; - size.y -= shellTrim.height; - } + if (fInformationControl instanceof IInformationControlExtension3) { + Rectangle shellTrim= ((IInformationControlExtension3) fInformationControl).computeTrim(); + size.x -= shellTrim.width; + size.y -= shellTrim.height; + } if (sizeConstraint.x < size.x) sizeConstraint.x= size.x; |