diff options
author | Paul Pazderski | 2019-05-19 21:32:16 +0000 |
---|---|---|
committer | Paul Pazderski | 2019-06-24 21:05:42 +0000 |
commit | 6afacb4913af567c273ad62405455ce6e72b6cb9 (patch) | |
tree | 9d6f8b5099c5ccd9f9283612e9831284996dda9a /org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java | |
parent | 68c0b2fa5325eacfc6f00650302e2e53a2fc53b0 (diff) | |
download | eclipse.platform.ua-6afacb4913af567c273ad62405455ce6e72b6cb9.tar.gz eclipse.platform.ua-6afacb4913af567c273ad62405455ce6e72b6cb9.tar.xz eclipse.platform.ua-6afacb4913af567c273ad62405455ce6e72b6cb9.zip |
Bug 547304 - [cleanup] Fix wrong space/tab indentationI20190626-0720I20190625-1800I20190625-0535I20190624-1800
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: Ie21edf6dba7384276d834e9fd10805b1f304403f
Diffstat (limited to 'org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java')
-rw-r--r-- | org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java index bcdba5989..343074529 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java @@ -231,7 +231,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { //set that item as complete. if (markAsCompleted) { if (!currentItem.isCompleted()) { - currentItem.setComplete(); + currentItem.setComplete(); } /* LP-item event */ // fireManagerItemEvent(ICheatSheetItemEvent.ITEM_COMPLETED, currentItem); @@ -260,7 +260,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { FormToolkit.ensureVisible(currentItem.getMainItemComposite()); } else if (indexNextItem == viewItemList.size()) { if (!currentItem.isCompletionMessageExpanded()) { // The event will already have been fired - getManager().fireEvent(ICheatSheetEvent.CHEATSHEET_COMPLETED); + getManager().fireEvent(ICheatSheetEvent.CHEATSHEET_COMPLETED); } showIntroItem(); } @@ -417,10 +417,10 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { } else { item.setButtonsVisible(true); if (i >currentItemNum || item.isCompleted()) { - item.setCompletionMessageExpanded(i + 1 >= viewItemList.size()); - } else { + item.setCompletionMessageExpanded(i + 1 >= viewItemList.size()); + } else { item.setCompletionMessageCollapsed(); - } + } } if (expandRestoreList.contains(Integer.toString(i))) { item.setCollapsed(); @@ -432,7 +432,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { CoreItem coreitemws = (CoreItem) item; ArrayList<SubItemCompositeHolder> subItemCompositeHolders = coreitemws .getListOfSubItemCompositeHolders(); - if (subItemCompositeHolders != null) { + if (subItemCompositeHolders != null) { while (st.hasMoreTokens()) { String token = st.nextToken(); subItemCompositeHolders.get(Integer.parseInt(token)).setCompleted(true); @@ -444,7 +444,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { } } - } + } } } if (skippedSubItemsItemList.contains(Integer.toString(i))) { @@ -859,10 +859,10 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { control.setRedraw(false); if (model instanceof CheatSheet) { - CheatSheet cheatSheetModel = (CheatSheet)model; + CheatSheet cheatSheetModel = (CheatSheet)model; - if (isRestricted && cheatSheetModel.isContainsCommandOrAction()) { - boolean isOK = MessageDialog.openConfirm(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), + if (isRestricted && cheatSheetModel.isContainsCommandOrAction()) { + boolean isOK = MessageDialog.openConfirm(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Messages.CHEATSHEET_FROM_URL_WITH_EXEC_TITLE, Messages.CHEATSHEET_FROM_URL_WITH_EXEC); @@ -871,22 +871,22 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { showStartPage(); return true; } - } + } currentPage = new CheatSheetPage(cheatSheetModel, viewItemList, this); - setCollapseExpandButtonEnabled(true); + setCollapseExpandButtonEnabled(true); } else if (model instanceof CompositeCheatSheetModel) { CompositeCheatSheetModel compositeCheatSheetModel = ((CompositeCheatSheetModel)model); compositeCheatSheetModel.setId(currentID); currentPage = new CompositeCheatSheetPage(compositeCheatSheetModel, stateManager); compositeCheatSheetModel.setCheatSheetManager(initManager()); setCollapseExpandButtonEnabled(false); - } - CheatSheetStopWatch.printLapTime("CheatSheetViewer.initCheatSheetView()", "Time in CheatSheetViewer.initCheatSheetView() after CheatSheetPage() call: "); //$NON-NLS-1$ //$NON-NLS-2$ - currentPage.createPart(control); - CheatSheetStopWatch.printLapTime("CheatSheetViewer.initCheatSheetView()", "Time in CheatSheetViewer.initCheatSheetView() after CheatSheetPage.createPart() call: "); //$NON-NLS-1$ //$NON-NLS-2$ + } + CheatSheetStopWatch.printLapTime("CheatSheetViewer.initCheatSheetView()", "Time in CheatSheetViewer.initCheatSheetView() after CheatSheetPage() call: "); //$NON-NLS-1$ //$NON-NLS-2$ + currentPage.createPart(control); + CheatSheetStopWatch.printLapTime("CheatSheetViewer.initCheatSheetView()", "Time in CheatSheetViewer.initCheatSheetView() after CheatSheetPage.createPart() call: "); //$NON-NLS-1$ //$NON-NLS-2$ - if (model instanceof CheatSheet) { + if (model instanceof CheatSheet) { CheatSheetStopWatch.printLapTime("CheatSheetViewer.initCheatSheetView()", "Time in CheatSheetViewer.initCheatSheetView() after fireEvent() call: "); //$NON-NLS-1$ //$NON-NLS-2$ if(!loadState()) { @@ -897,7 +897,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { } getManager().fireEvent(ICheatSheetEvent.CHEATSHEET_OPENED); - } + } CheatSheetStopWatch.printLapTime("CheatSheetViewer.initCheatSheetView()", "Time in CheatSheetViewer.initCheatSheetView() after checkSavedState() call: "); //$NON-NLS-1$ //$NON-NLS-2$ currentPage.initialized(); @@ -908,7 +908,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { if (currentItem != null && !currentItem.isCompleted()) currentItem.setFocus(); CheatSheetStopWatch.printLapTime("CheatSheetViewer.initCheatSheetView()", "Time in CheatSheetViewer.initCheatSheetView() at end of method: "); //$NON-NLS-1$ //$NON-NLS-2$ - return true; + return true; } private void internalDispose() { @@ -1043,9 +1043,9 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { if (status.isOK() && dialogReturnCode != Window.CANCEL) { coreItem.setRestartImage(); if (!coreItem.hasConfirm()) { - //set that item as complete. - advanceItem(link, true); - saveCurrentSheet(); + //set that item as complete. + advanceItem(link, true); + saveCurrentSheet(); } } } @@ -1089,10 +1089,10 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { if(currentID != null) { if (currentPage instanceof CheatSheetPage) { Properties properties = saveHelper.createProperties(currentItemNum, viewItemList, getExpandRestoreActionState(), expandRestoreList, currentID, restorePath); - IStatus status = stateManager.saveState(properties, getManager()); - if (!status.isOK()) { - CheatSheetPlugin.getPlugin().getLog().log(status); - } + IStatus status = stateManager.saveState(properties, getManager()); + if (!status.isOK()) { + CheatSheetPlugin.getPlugin().getLog().log(status); + } } else if (currentPage instanceof CompositeCheatSheetPage) { ((CompositeCheatSheetPage)currentPage).saveState(); } @@ -1174,7 +1174,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { errorMessage = NLS.bind(Messages.ERROR_OPENING_FILE_IN_PARSER, (new Object[] {element.getHref()})); } } - String pluginId = bundle != null ? bundle.getSymbolicName() : null; + String pluginId = bundle != null ? bundle.getSymbolicName() : null; parserInput = new ParserInput(contentURL, pluginId, errorMessage); } @@ -1268,7 +1268,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { setContent(element, inputStateManager); } - /*package*/ void toggleExpandRestore() { + /*package*/ void toggleExpandRestore() { if(expandRestoreAction == null) return; @@ -1321,7 +1321,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor { public void saveState(IMemento memento) { if (currentPage instanceof CheatSheetPage) { Properties properties = saveHelper.createProperties(currentItemNum, viewItemList, getExpandRestoreActionState(), expandRestoreList, currentID, restorePath); - saveHelper.saveToMemento(properties, getManager(), memento); + saveHelper.saveToMemento(properties, getManager(), memento); } } |