diff options
Diffstat (limited to 'org.eclipse.ui.cheatsheets')
44 files changed, 400 insertions, 400 deletions
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/ICheatSheetEvent.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/ICheatSheetEvent.java index b7f4df239..6ef8ed059 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/ICheatSheetEvent.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/ICheatSheetEvent.java @@ -33,14 +33,14 @@ public interface ICheatSheetEvent { /** * Event type constant (value {@value}) indicating that * the cheat sheet was opened. This is the first event - * in the life of a running cheat sheet. + * in the life of a running cheat sheet. */ public static final int CHEATSHEET_OPENED = 0; /** * Event type constant (value {@value}) indicating that * the cheat sheet was closed. This is the last event - * in the life of a running cheat sheet. + * in the life of a running cheat sheet. */ public static final int CHEATSHEET_CLOSED = 1; diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/ActionRunner.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/ActionRunner.java index c8fc5c47a..2aa5bc648 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/ActionRunner.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/ActionRunner.java @@ -97,8 +97,8 @@ public class ActionRunner { if (status.isOK() && listenerFired[0]) { if (!listenerResult[0]) { - status =new Status(IStatus.WARNING, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, Messages.ACTION_FAILED, null); - } + status =new Status(IStatus.WARNING, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, Messages.ACTION_FAILED, null); + } } return status; diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatsheetSearchParticipant.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatsheetSearchParticipant.java index 287820267..312e10633 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatsheetSearchParticipant.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatsheetSearchParticipant.java @@ -76,7 +76,7 @@ public class CheatsheetSearchParticipant extends SearchParticipantXML { HashSet<String> set = new HashSet<>(); for (IConfigurationElement element : elements) { if (element.getName().equals(CheatSheetRegistryReader.TAG_CHEATSHEET)) { - set.add(element.getContributor().getName()); + set.add(element.getContributor().getName()); } } return set; @@ -93,12 +93,12 @@ public class CheatsheetSearchParticipant extends SearchParticipantXML { data.setTitle(attributes.getValue(ICompositeCheatsheetTags.NAME)); } else if (name.equals(IParserTags.ITEM)) { data.addText(attributes.getValue(IParserTags.TITLE)); - } else if (name.equals(IParserTags.SUBITEM)) { - data.addText(attributes.getValue(IParserTags.LABEL)); - } else if (name.equals(ICompositeCheatsheetTags.TASK ) - || name.equals(ICompositeCheatsheetTags.TASK_GROUP)) { - data.addText(attributes.getValue(ICompositeCheatsheetTags.NAME)); - } + } else if (name.equals(IParserTags.SUBITEM)) { + data.addText(attributes.getValue(IParserTags.LABEL)); + } else if (name.equals(ICompositeCheatsheetTags.TASK ) + || name.equals(ICompositeCheatsheetTags.TASK_GROUP)) { + data.addText(attributes.getValue(ICompositeCheatsheetTags.NAME)); + } } @Override diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CommandRunner.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CommandRunner.java index a8f2484fb..8dd33fed1 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CommandRunner.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CommandRunner.java @@ -38,9 +38,9 @@ public class CommandRunner { IWorkbench wb = PlatformUI.getWorkbench(); if (wb != null) { ICommandService serviceObject = wb.getAdapter(ICommandService.class); - if (serviceObject != null) { + if (serviceObject != null) { return serviceObject; - } + } } return null; } @@ -49,9 +49,9 @@ public class CommandRunner { IWorkbench wb = PlatformUI.getWorkbench(); if (wb != null) { IHandlerService serviceObject = wb.getAdapter(IHandlerService.class); - if (serviceObject != null) { + if (serviceObject != null) { return serviceObject; - } + } } return null; } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ConfirmRestartDialog.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ConfirmRestartDialog.java index 853132c26..b1577f825 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ConfirmRestartDialog.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ConfirmRestartDialog.java @@ -79,7 +79,7 @@ public class ConfirmRestartDialog extends Dialog { private TreeLabelProvider treeLabelProvider; protected ConfirmRestartDialog(Shell parentShell, AbstractTask[] restartTasks, - TreeLabelProvider treeLabelProvider) { + TreeLabelProvider treeLabelProvider) { super(parentShell); this.tasks = restartTasks; this.treeLabelProvider = treeLabelProvider; diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java index 9f0f7e449..7768d2276 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java @@ -33,7 +33,7 @@ public class ResetTaskAction extends Action { private AbstractTask task; public ResetTaskAction(ICompositeCheatSheetTask task) { - this.task = (AbstractTask) task; + this.task = (AbstractTask) task; this.setText(Messages.COMPOSITE_MENU_RESET); IPath path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_ELCL).append("return_to_start.png");//$NON-NLS-1$ ImageDescriptor restartImage = CheatSheetPlugin.createImageDescriptor(CheatSheetPlugin.getPlugin().getBundle(), path); diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/RestartAllAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/RestartAllAction.java index 049389309..fc78617e3 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/RestartAllAction.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/RestartAllAction.java @@ -29,7 +29,7 @@ public class RestartAllAction extends Action { private ICompositeCheatSheet model; public RestartAllAction(ICompositeCheatSheet model) { - this.model = model; + this.model = model; this.setText(Messages.RESTART_ALL_MENU); IPath path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_ELCL).append("restart_all.png");//$NON-NLS-1$ ImageDescriptor restartImage = CheatSheetPlugin.createImageDescriptor(CheatSheetPlugin.getPlugin().getBundle(), path); @@ -39,7 +39,7 @@ public class RestartAllAction extends Action { @Override public void run() { if (confirmRestart()) { - ((CompositeCheatSheetModel)model).resetAllTasks(null); + ((CompositeCheatSheetModel)model).resetAllTasks(null); } } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/SkipAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/SkipAction.java index f5f1a9471..690c2f3c6 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/SkipAction.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/SkipAction.java @@ -37,7 +37,7 @@ public class SkipAction extends Action { @Override public void run() { - task.setState(ICompositeCheatSheetTask.SKIPPED); + task.setState(ICompositeCheatSheetTask.SKIPPED); } } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeExplorerMenu.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeExplorerMenu.java index f98dcd45d..3f69ce531 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeExplorerMenu.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeExplorerMenu.java @@ -53,13 +53,13 @@ public class TreeExplorerMenu { if (selectedTask == null) return; // Start - StartAction startAction = new StartAction(selectedTask); - startAction.setEnabled(TaskStateUtilities.isStartEnabled(selectedTask)); + StartAction startAction = new StartAction(selectedTask); + startAction.setEnabled(TaskStateUtilities.isStartEnabled(selectedTask)); manager.add(startAction); // Skip - SkipAction skipAction = new SkipAction(selectedTask); - skipAction.setEnabled(TaskStateUtilities.isSkipEnabled(selectedTask)); + SkipAction skipAction = new SkipAction(selectedTask); + skipAction.setEnabled(TaskStateUtilities.isSkipEnabled(selectedTask)); manager.add(skipAction); // Restart diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java index 201aaa701..8df69b103 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java @@ -72,7 +72,7 @@ public class TreeLabelProvider extends LabelProvider { if (obj instanceof ICompositeCheatSheetTask) { result = ((ICompositeCheatSheetTask) obj).getName(); } else { - result = obj.toString(); + result = obj.toString(); } if (result == null) { result = ""; //$NON-NLS-1$ @@ -98,7 +98,7 @@ public class TreeLabelProvider extends LabelProvider { if (isBlocked) { return images.getImage(BLOCKED); } - return images.getImage(state); + return images.getImage(state); } /** @@ -109,28 +109,28 @@ public class TreeLabelProvider extends LabelProvider { private ImageSet createImages(String kind) { ImageSet images = new ImageSet(); ImageDescriptor desc = getPredefinedImageDescriptor(kind, true); - if (desc == null) { - desc = TaskEditorManager.getInstance().getImageDescriptor(kind); - } + if (desc == null) { + desc = TaskEditorManager.getInstance().getImageDescriptor(kind); + } if (desc != null) { Image baseImage = desc.createImage(); images.put(ICompositeCheatSheetTask.NOT_STARTED, baseImage); createImageWithOverlay(ICompositeCheatSheetTask.IN_PROGRESS, "$nl$/icons/ovr16/task_in_progress.png", //$NON-NLS-1$ - images, - desc); + images, + desc); createImageWithOverlay(ICompositeCheatSheetTask.SKIPPED, "$nl$/icons/ovr16/task_skipped.png", //$NON-NLS-1$ - images, - desc); + images, + desc); createDisabledImage(kind, BLOCKED, - images, - baseImage); + images, + baseImage); createImageWithOverlay(ICompositeCheatSheetTask.COMPLETED, "$nl$/icons/ovr16/task_complete.png", //$NON-NLS-1$ - images, - desc); + images, + desc); } return images; @@ -177,7 +177,7 @@ public class TreeLabelProvider extends LabelProvider { if (desc != null) { disabledImage = desc.createImage(); } else { - disabledImage = createGrayedImage(baseImage); + disabledImage = createGrayedImage(baseImage); } images.put(state, disabledImage); } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java index f37fa9c32..a43bb33da 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java @@ -164,7 +164,7 @@ public abstract class AbstractTask implements ICompositeCheatSheetTask { * @param state */ public void setState(int state) { - setStateNoNotify(state); + setStateNoNotify(state); model.sendTaskChangeEvents(); } @@ -177,7 +177,7 @@ public abstract class AbstractTask implements ICompositeCheatSheetTask { public void setStateNoNotify(int state) { this.state = state; if (parent != null) { - parent.checkState(); + parent.checkState(); } model.stateChanged(this); } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/BlockedTaskFinder.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/BlockedTaskFinder.java index d3524b010..c30892fae 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/BlockedTaskFinder.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/BlockedTaskFinder.java @@ -35,8 +35,8 @@ public class BlockedTaskFinder { * * This takes several steps. * <li> If a group is completed, skipped or reset add any non-started children. - * <li> Determine all successors of tasks whose state has changed that are not in the change set - * <li> Add the successor and its children to the list if not started + * <li> Determine all successors of tasks whose state has changed that are not in the change set + * <li> Add the successor and its children to the list if not started */ public Set<ICompositeCheatSheetTask> findBlockedTaskChanges(Set<ICompositeCheatSheetTask> stateChangedTasks) { @@ -50,7 +50,7 @@ public class BlockedTaskFinder { private void visitChangedTasks() { for (ICompositeCheatSheetTask nextTask : stateChangedTasks) { if (nextTask.getState() != ICompositeCheatSheetTask.IN_PROGRESS) { - findUnstartedChildren(nextTask); + findUnstartedChildren(nextTask); } } } @@ -64,10 +64,10 @@ public class BlockedTaskFinder { for (ICompositeCheatSheetTask nextChild : children) { // Ignore if this task has been seen before if ((!stateChangedTasks.contains(nextChild)) && !impactedTasks.contains(nextChild)) { - if (nextChild.getState() == ICompositeCheatSheetTask.NOT_STARTED) { - impactedTasks.add(nextChild); - } - findUnstartedChildren(nextChild); + if (nextChild.getState() == ICompositeCheatSheetTask.NOT_STARTED) { + impactedTasks.add(nextChild); + } + findUnstartedChildren(nextChild); } } } @@ -80,7 +80,7 @@ public class BlockedTaskFinder { if (nextSuccessor.getState() == ICompositeCheatSheetTask.NOT_STARTED) { impactedTasks.add(nextSuccessor); } - findUnstartedChildren(nextSuccessor); + findUnstartedChildren(nextSuccessor); } } } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetModel.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetModel.java index a1cdd607c..43fb1654d 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetModel.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetModel.java @@ -47,9 +47,9 @@ public class CompositeCheatSheetModel extends Observable implements ICompositeCh public CompositeCheatSheetModel(String name, String description, String explorerId) { this.name = name; - this.description = description; - this.explorerId = explorerId; - this.dependencies = new TaskDependencies(); + this.description = description; + this.explorerId = explorerId; + this.dependencies = new TaskDependencies(); } public String getName() { @@ -150,32 +150,32 @@ public class CompositeCheatSheetModel extends Observable implements ICompositeCh */ private void resetTask(ICompositeCheatSheetTask task) { if (task instanceof EditableTask) { - EditableTask editable = (EditableTask)task; + EditableTask editable = (EditableTask)task; editable.reset(); if (saveHelper != null) { - saveHelper.clearTaskMemento(task.getId()); + saveHelper.clearTaskMemento(task.getId()); } } else if (task instanceof TaskGroup) { TaskGroup group = (TaskGroup)task; - ICompositeCheatSheetTask[] subtasks = group.getSubtasks(); + ICompositeCheatSheetTask[] subtasks = group.getSubtasks(); for (ICompositeCheatSheetTask subtask : subtasks) { resetTask(subtask); - } - group.setStateNoNotify(ICompositeCheatSheetTask.NOT_STARTED); + } + group.setStateNoNotify(ICompositeCheatSheetTask.NOT_STARTED); } } public void resetAllTasks(Map<String, String> cheatSheetData) { - if (manager != null) { - if (cheatSheetData == null) { + if (manager != null) { + if (cheatSheetData == null) { manager.setData(new Hashtable<>()); - } else { - manager.setData(cheatSheetData); - } - } - saveHelper.clearTaskMementos(); - resetTask(getRootTask()); - sendTaskChangeEvents(); + } else { + manager.setData(cheatSheetData); + } + } + saveHelper.clearTaskMementos(); + resetTask(getRootTask()); + sendTaskChangeEvents(); } /** diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetSaveHelper.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetSaveHelper.java index e127e4855..7fbf20807 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetSaveHelper.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetSaveHelper.java @@ -57,12 +57,12 @@ public class CompositeCheatSheetSaveHelper { if (readMemento == null) { return Status.OK_STATUS; } - taskMementoMap = createTaskMap(readMemento); - loadTaskState(taskMementoMap, (AbstractTask)model.getRootTask()); - loadCheatsheetManagerData(readMemento, model.getCheatSheetManager()); - loadLayoutData(readMemento, layoutData); - model.sendTaskChangeEvents(); - return Status.OK_STATUS; + taskMementoMap = createTaskMap(readMemento); + loadTaskState(taskMementoMap, (AbstractTask)model.getRootTask()); + loadCheatsheetManagerData(readMemento, model.getCheatSheetManager()); + loadLayoutData(readMemento, layoutData); + model.sendTaskChangeEvents(); + return Status.OK_STATUS; } private Map<String, IMemento> createTaskMap(XMLMemento readMemento) { @@ -129,8 +129,8 @@ public class CompositeCheatSheetSaveHelper { if (stateManager instanceof NoSaveStateManager) return Status.OK_STATUS; XMLMemento writeMemento = XMLMemento.createWriteRoot(ICompositeCheatsheetTags.COMPOSITE_CHEATSHEET_STATE); writeMemento.putString(IParserTags.ID, model.getId()); - saveTaskState(writeMemento, (AbstractTask)model.getRootTask()); - saveCheatSheetManagerData(writeMemento, model.getCheatSheetManager()); + saveTaskState(writeMemento, (AbstractTask)model.getRootTask()); + saveCheatSheetManagerData(writeMemento, model.getCheatSheetManager()); taskMementoMap = createTaskMap(writeMemento); if (layoutData != null) { saveMap(writeMemento, layoutData, ICompositeCheatsheetTags.LAYOUT_DATA); @@ -182,9 +182,9 @@ public class CompositeCheatSheetSaveHelper { } private TaskEditor getEditor(AbstractTask task) { - if (task instanceof EditableTask) { - return ((EditableTask)task).getEditor(); - } + if (task instanceof EditableTask) { + return ((EditableTask)task).getEditor(); + } return null; } @@ -193,10 +193,10 @@ public class CompositeCheatSheetSaveHelper { return null; } IMemento childMemento = taskMementoMap.get(id); - if (childMemento == null) { - return null; - } - return childMemento.getChild(ICompositeCheatsheetTags.TASK_DATA); + if (childMemento == null) { + return null; + } + return childMemento.getChild(ICompositeCheatsheetTags.TASK_DATA); } public void clearTaskMementos() { diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/SuccesorTaskFinder.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/SuccesorTaskFinder.java index 0d6a4f603..f67072f2e 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/SuccesorTaskFinder.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/SuccesorTaskFinder.java @@ -43,18 +43,18 @@ public class SuccesorTaskFinder { * @param task The task which was just completed * @return An array of tasks which can be started */ - public ICompositeCheatSheetTask[] getRecommendedSuccessors() - { - // TODO this code could be moved to TaskGroup - if (ITaskGroup.CHOICE.equals(currentTask.getKind())) { - // For a choice if more than one child is runnable return it + public ICompositeCheatSheetTask[] getRecommendedSuccessors() + { + // TODO this code could be moved to TaskGroup + if (ITaskGroup.CHOICE.equals(currentTask.getKind())) { + // For a choice if more than one child is runnable return it List<ICompositeCheatSheetTask> runnableChoices = findRunnableChoices(); - if (runnableChoices.size() != 0) { + if (runnableChoices.size() != 0) { return runnableChoices.toArray(new ICompositeCheatSheetTask[runnableChoices.size()]); - } - } - return getBestSuccessor(); - } + } + } + return getBestSuccessor(); + } private List<ICompositeCheatSheetTask> findRunnableChoices() { List<ICompositeCheatSheetTask> result = new ArrayList<>(); @@ -72,14 +72,14 @@ public class SuccesorTaskFinder { private boolean isStartable(ICompositeCheatSheetTask task) { int state = task.getState(); return (state != ICompositeCheatSheetTask.COMPLETED && - state != ICompositeCheatSheetTask.SKIPPED && - task.requiredTasksCompleted()); + state != ICompositeCheatSheetTask.SKIPPED && + task.requiredTasksCompleted()); } private ICompositeCheatSheetTask[] getBestSuccessor() { bestLaterTask = null; - bestEarlierTask = null; - seenThisTask = false; + bestEarlierTask = null; + seenThisTask = false; searchRunnableChildren(currentTask.getCompositeCheatSheet().getRootTask()); // If there is a task which is found later in the tree return // that, otherwise an earlier task. diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskChoiceCompletionStrategy.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskChoiceCompletionStrategy.java index f08498e30..03d9080f8 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskChoiceCompletionStrategy.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskChoiceCompletionStrategy.java @@ -32,16 +32,16 @@ public class TaskChoiceCompletionStrategy implements TaskGroup.CompletionStrateg ICompositeCheatSheetTask[] children = taskGroup.getSubtasks(); for (ICompositeCheatSheetTask element : children) { switch (element.getState()) { - case ICompositeCheatSheetTask.NOT_STARTED: - break; - case ICompositeCheatSheetTask.IN_PROGRESS: - noChildrenStarted = false; - break; - case ICompositeCheatSheetTask.SKIPPED: - case ICompositeCheatSheetTask.COMPLETED: - noChildrenStarted = false; - atLeastOneChildCompleted = true; - break; + case ICompositeCheatSheetTask.NOT_STARTED: + break; + case ICompositeCheatSheetTask.IN_PROGRESS: + noChildrenStarted = false; + break; + case ICompositeCheatSheetTask.SKIPPED: + case ICompositeCheatSheetTask.COMPLETED: + noChildrenStarted = false; + atLeastOneChildCompleted = true; + break; } } if (atLeastOneChildCompleted || children.length == 0) { diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskDependencies.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskDependencies.java index 242f91e75..91f6c5331 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskDependencies.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskDependencies.java @@ -173,13 +173,13 @@ public class TaskDependencies { lastTask = thisTask; thisTask = task.getName(); if (lastTask != null) { - String message = NLS.bind(Messages.ERROR_PARSING_CYCLE_CONTAINS, (new Object[] {lastTask, thisTask})); - status.addStatus(IStatus.ERROR, message, null); + String message = NLS.bind(Messages.ERROR_PARSING_CYCLE_CONTAINS, (new Object[] {lastTask, thisTask})); + status.addStatus(IStatus.ERROR, message, null); } } } String message = NLS.bind(Messages.ERROR_PARSING_CYCLE_CONTAINS, (new Object[] {thisTask, firstTask})); - status.addStatus(IStatus.ERROR, message, null); + status.addStatus(IStatus.ERROR, message, null); } } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskGroup.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskGroup.java index ef4d549ef..8d962d7ac 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskGroup.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskGroup.java @@ -81,8 +81,8 @@ public class TaskGroup extends AbstractTask implements ITaskGroup { /** * Determine the state based on the state of the children, which - * will use a different computation depending on whether this is a set, - * sequence or choice. + * will use a different computation depending on whether this is a set, + * sequence or choice. */ public int computeState() { return completionStrategy.computeState(this); diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskSetCompletionStrategy.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskSetCompletionStrategy.java index 938b23f59..2623c880d 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskSetCompletionStrategy.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskSetCompletionStrategy.java @@ -32,17 +32,17 @@ public class TaskSetCompletionStrategy implements TaskGroup.CompletionStrategy { ICompositeCheatSheetTask[] children = taskGroup.getSubtasks(); for (ICompositeCheatSheetTask element : children) { switch (element.getState()) { - case ICompositeCheatSheetTask.NOT_STARTED: - allChildrenCompleted = false; - break; - case ICompositeCheatSheetTask.IN_PROGRESS: - noChildrenStarted = false; - allChildrenCompleted = false; - break; - case ICompositeCheatSheetTask.COMPLETED: - case ICompositeCheatSheetTask.SKIPPED: - noChildrenStarted = false; - break; + case ICompositeCheatSheetTask.NOT_STARTED: + allChildrenCompleted = false; + break; + case ICompositeCheatSheetTask.IN_PROGRESS: + noChildrenStarted = false; + allChildrenCompleted = false; + break; + case ICompositeCheatSheetTask.COMPLETED: + case ICompositeCheatSheetTask.SKIPPED: + noChildrenStarted = false; + break; } } if (allChildrenCompleted) { diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskStateUtilities.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskStateUtilities.java index 54fb6054f..9eedca252 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskStateUtilities.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskStateUtilities.java @@ -40,7 +40,7 @@ public class TaskStateUtilities { if (parent == null) { return null; } - if (!parent.requiredTasksCompleted()) { + if (!parent.requiredTasksCompleted()) { return parent; } return findBlockedAncestor(parent); @@ -56,7 +56,7 @@ public class TaskStateUtilities { if (parent == null) { return null; } - if (parent.getState() == ICompositeCheatSheetTask.SKIPPED) { + if (parent.getState() == ICompositeCheatSheetTask.SKIPPED) { return parent; } return findSkippedAncestor(parent); @@ -72,7 +72,7 @@ public class TaskStateUtilities { if (parent == null) { return null; } - if (parent.getState() == ICompositeCheatSheetTask.COMPLETED) { + if (parent.getState() == ICompositeCheatSheetTask.COMPLETED) { return parent; } return findCompletedAncestor(parent); @@ -116,11 +116,11 @@ public class TaskStateUtilities { */ private static boolean isStartable(ICompositeCheatSheetTask task) { if (task.getState() != ICompositeCheatSheetTask.NOT_STARTED) return false; - if (findSkippedAncestor(task) != null) return false; - if (findCompletedAncestor(task) != null) return false; - if (!task.requiredTasksCompleted()) return false; - if (findBlockedAncestor(task) != null) return false; - return true; + if (findSkippedAncestor(task) != null) return false; + if (findCompletedAncestor(task) != null) return false; + if (!task.requiredTasksCompleted()) return false; + if (findBlockedAncestor(task) != null) return false; + return true; } /** diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/CompositeCheatSheetParser.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/CompositeCheatSheetParser.java index 7d5a77378..cac5d13fd 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/CompositeCheatSheetParser.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/CompositeCheatSheetParser.java @@ -192,7 +192,7 @@ public class CompositeCheatSheetParser implements IStatusContainer { } if (status.getSeverity() != IStatus.ERROR) { compositeCS.setContentUrl(url); - return compositeCS; + return compositeCS; } } return null; @@ -209,12 +209,12 @@ public class CompositeCheatSheetParser implements IStatusContainer { Node nextNode = childNodes.item(index); if (isAbstractTask(nextNode.getNodeName()) ) { AbstractTask task = parseAbstractTask(nextNode, model); - if (model.getRootTask() == null ) { + if (model.getRootTask() == null ) { model.setRootTask(task); parseTaskChildren(nextNode, task, model); - } else { - addStatus(IStatus.ERROR, Messages.ERROR_PARSING_MULTIPLE_ROOT, null); - } + } else { + addStatus(IStatus.ERROR, Messages.ERROR_PARSING_MULTIPLE_ROOT, null); + } } } } @@ -242,18 +242,18 @@ public class CompositeCheatSheetParser implements IStatusContainer { parseDependency(childNode, parentTask, model); } else if (CompositeCheatSheetParser.isAbstractTask(nodeName)) { if (parentTask instanceof TaskGroup) { - AbstractTask task = parseAbstractTask(childNode, model); - ((TaskGroup)parentTask).addSubtask(task); - parseTaskChildren(childNode, task, model); + AbstractTask task = parseAbstractTask(childNode, model); + ((TaskGroup)parentTask).addSubtask(task); + parseTaskChildren(childNode, task, model); } - } else { + } else { if (!strategy.parseElementNode(childNode, parentNode, parentTask, this)) { String message = NLS .bind( Messages.WARNING_PARSING_UNKNOWN_ELEMENT, (new Object[] { nodeName, parentNode.getNodeName() })); - addStatus(IStatus.WARNING, message, null); + addStatus(IStatus.WARNING, message, null); } } } @@ -265,13 +265,13 @@ public class CompositeCheatSheetParser implements IStatusContainer { private void parseDependency(Node taskNode, AbstractTask task, CompositeCheatSheetModel model) { NamedNodeMap attributes = taskNode.getAttributes(); if (attributes != null) { - Node taskAttribute = attributes.getNamedItem(ICompositeCheatsheetTags.TASK); - if (taskAttribute != null) { - String requiredTaskId = taskAttribute.getNodeValue(); - model.getDependencies().addDependency(task, requiredTaskId); - } else { - addStatus(IStatus.ERROR, Messages.ERROR_PARSING_NO_ID, null); - } + Node taskAttribute = attributes.getNamedItem(ICompositeCheatsheetTags.TASK); + if (taskAttribute != null) { + String requiredTaskId = taskAttribute.getNodeValue(); + model.getDependencies().addDependency(task, requiredTaskId); + } else { + addStatus(IStatus.ERROR, Messages.ERROR_PARSING_NO_ID, null); + } } } @@ -348,7 +348,7 @@ public class CompositeCheatSheetParser implements IStatusContainer { String message = NLS.bind(Messages.ERROR_PARSING_DUPLICATE_TASK_ID, (new Object[] {id, })); addStatus(IStatus.ERROR, message, null); } else { - model.getDependencies().saveId(task); + model.getDependencies().saveId(task); } return task; diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/EditableTaskParseStrategy.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/EditableTaskParseStrategy.java index 3fda8d9d8..e19e5a00b 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/EditableTaskParseStrategy.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/EditableTaskParseStrategy.java @@ -55,13 +55,13 @@ public class EditableTaskParseStrategy implements ITaskParseStrategy { String message = NLS.bind( Messages.ERROR_PARSING_TASK_NO_KIND, (new Object[] { parentTask.getName()})); - status.addStatus(IStatus.ERROR, message, null); + status.addStatus(IStatus.ERROR, message, null); } else if (CheatSheetRegistryReader.getInstance(). findTaskEditor(parentTask.getKind()) == null) { String message = NLS.bind( Messages.ERROR_PARSING_TASK_INVALID_KIND, (new Object[] { parentTask.getKind(), ICompositeCheatsheetTags.TASK, parentTask.getName()})); - status.addStatus(IStatus.ERROR, message, null); + status.addStatus(IStatus.ERROR, message, null); } } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/ICompositeCheatsheetTags.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/ICompositeCheatsheetTags.java index 55b5631fb..414ad3161 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/ICompositeCheatsheetTags.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/ICompositeCheatsheetTags.java @@ -36,13 +36,13 @@ public interface ICompositeCheatsheetTags { // Attribute values public static final String TREE = "tree"; //$NON-NLS-1$ - // Cheatsheet task parameters + // Cheatsheet task parameters public static final String CHEATSHEET_TASK_KIND = "cheatsheet"; //$NON-NLS-1$ public static final String CHEATSHEET_TASK_ID = "id"; //$NON-NLS-1$ public static final String CHEATSHEET_TASK_PATH = "path"; //$NON-NLS-1$ public static final String CHEATSHEET_TASK_SHOW_INTRO = "showIntro"; //$NON-NLS-1$ - // Tags used in Memento + // Tags used in Memento public static final String TASK_DATA = "taskData"; //$NON-NLS-1$ public static final String CHEAT_SHEET_MANAGER = "cheatSheetManager"; //$NON-NLS-1$ public static final String KEY = "key"; //$NON-NLS-1$ diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/MarkupParser.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/MarkupParser.java index 8ad0107f2..896e58317 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/MarkupParser.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/MarkupParser.java @@ -25,7 +25,7 @@ public class MarkupParser { } private static String parseMarkup(Node parentNode) { - NodeList children = parentNode.getChildNodes(); + NodeList children = parentNode.getChildNodes(); StringBuilder text = new StringBuilder(); for (int i = 0; i < children.getLength(); i++) { Node childNode = children.item(i); diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/TaskGroupParseStrategy.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/TaskGroupParseStrategy.java index 5ef79b82d..89f5fc235 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/TaskGroupParseStrategy.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/TaskGroupParseStrategy.java @@ -35,7 +35,7 @@ public class TaskGroupParseStrategy implements ITaskParseStrategy { @Override public boolean parseElementNode(Node childNode, Node parentNode, AbstractTask parentTask, IStatusContainer status) - { + { // Task children are handled by CompositeCheatSheetParser return false; } @@ -64,7 +64,7 @@ public class TaskGroupParseStrategy implements ITaskParseStrategy { String message = NLS.bind( Messages.ERROR_PARSING_TASK_INVALID_KIND, (new Object[] { parentTask.getKind(), ICompositeCheatsheetTags.TASK_GROUP, parentTask.getName()})); - status.addStatus(IStatus.ERROR, message, null); + status.addStatus(IStatus.ERROR, message, null); } } @@ -73,7 +73,7 @@ public class TaskGroupParseStrategy implements ITaskParseStrategy { String message = NLS.bind( Messages.ERROR_PARSING_CHILDLESS_TASK_GROUP, (new Object[] { parentTask.getName()})); - status.addStatus(IStatus.ERROR, message, null); + status.addStatus(IStatus.ERROR, message, null); } } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CheatsheetTaskEditor.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CheatsheetTaskEditor.java index d9fdf34ef..63ea4ef92 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CheatsheetTaskEditor.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CheatsheetTaskEditor.java @@ -70,7 +70,7 @@ public class CheatsheetTaskEditor extends TaskEditor { id = task.getId(); } if (url != null) { - viewer.setInput(id, task.getName(), url, stateManager, false); + viewer.setInput(id, task.getName(), url, stateManager, false); } else { errorBadUrl(path); } @@ -78,7 +78,7 @@ public class CheatsheetTaskEditor extends TaskEditor { errorBadUrl(path); } } else if (id != null){ - viewer.setInput(id, stateManager); + viewer.setInput(id, stateManager); } else { viewer.showError(Messages.CHEATSHEET_TASK_NO_ID); } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CompositeCheatSheetPage.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CompositeCheatSheetPage.java index 2d2719f21..fadd60d20 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CompositeCheatSheetPage.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CompositeCheatSheetPage.java @@ -253,10 +253,10 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi for (Control excontrol : excontrols) { Object data = excontrol.getData(ICompositeCheatsheetTags.EXPLORER); if (data instanceof TaskExplorer) { - explorer = (TaskExplorer)data; - if (explorer.getId().equals(id)) { - return explorer; - } + explorer = (TaskExplorer)data; + if (explorer.getId().equals(id)) { + return explorer; + } } } @@ -315,7 +315,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi public void saveState() { Map<String, String> layout = new HashMap<>(); if (selectedTask != null) { - layout.put(ICompositeCheatsheetTags.SELECTED_TASK, selectedTask.getId()); + layout.put(ICompositeCheatsheetTags.SELECTED_TASK, selectedTask.getId()); } saveHelper.saveCompositeState(model, layout); } @@ -366,16 +366,16 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi GridData data = new GridData(); data.heightHint = 1; data.horizontalAlignment = SWT.FILL; - separator.setLayoutData(data); - FormText text = toolkit.createFormText(container, false); + separator.setLayoutData(data); + FormText text = toolkit.createFormText(container, false); text.setImage(DescriptionPanel.REVIEW_IMAGE, CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.COMPOSITE_TASK_REVIEW)); - text.addHyperlinkListener(getEndReviewListener()); - text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + text.addHyperlinkListener(getEndReviewListener()); + text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); StringBuilder buf = new StringBuilder(); - buf.append("<form>"); //$NON-NLS-1$ - addHyperlink(buf, END_REVIEW_TAG + task.getId(), DescriptionPanel.REVIEW_IMAGE, Messages.COMPOSITE_PAGE_END_REVIEW ); - buf.append("</form>"); //$NON-NLS-1$ - text.setText(buf.toString(), true, false); + buf.append("<form>"); //$NON-NLS-1$ + addHyperlink(buf, END_REVIEW_TAG + task.getId(), DescriptionPanel.REVIEW_IMAGE, Messages.COMPOSITE_PAGE_END_REVIEW ); + buf.append("</form>"); //$NON-NLS-1$ + text.setText(buf.toString(), true, false); task.setUnderReview(true); container.layout(true); showEditor(task); @@ -409,29 +409,29 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi if (ref.equals(START_HREF)) { Object data = descriptionPanel.getControl().getData(ICompositeCheatsheetTags.TASK); if (data instanceof EditableTask) { - EditableTask task = (EditableTask)data; - task.setStarted(); + EditableTask task = (EditableTask)data; + task.setStarted(); } } - if (ref.equals(SKIP_HREF)) { + if (ref.equals(SKIP_HREF)) { Object data = descriptionPanel.getControl().getData(ICompositeCheatsheetTags.TASK); if (data instanceof AbstractTask) { - AbstractTask task = (AbstractTask)data; - task.setState(ICompositeCheatSheetTask.SKIPPED); + AbstractTask task = (AbstractTask)data; + task.setState(ICompositeCheatSheetTask.SKIPPED); } } if (ref.equals(REVIEW_TAG)) { Object data = descriptionPanel.getControl().getData(ICompositeCheatsheetTags.TASK); if (data instanceof EditableTask) { - reviewTask((EditableTask) data); + reviewTask((EditableTask) data); } } if (ref.startsWith(GOTO_TASK_TAG)) { String next = ref.substring(GOTO_TASK_TAG.length()); AbstractTask nextTask = - model.getDependencies().getTask(next); + model.getDependencies().getTask(next); currentExplorer.setSelection - (new StructuredSelection(nextTask), true); + (new StructuredSelection(nextTask), true); } } } @@ -447,7 +447,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi if (ref.startsWith(END_REVIEW_TAG)) { String next = ref.substring(END_REVIEW_TAG.length()); AbstractTask task = - model.getDependencies().getTask(next); + model.getDependencies().getTask(next); endReview((EditableTask)task); } } @@ -468,7 +468,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi */ private TaskEditor getTaskEditor(EditableTask editable) { if (editable.getEditor() == null) { - // Create a new editor using the extension point data + // Create a new editor using the extension point data TaskEditor editor = TaskEditorManager.getInstance().getEditor(editable.getKind()); if (editor != null) { Composite editorPanel = new Composite(taskEditorContainer, SWT.NULL); @@ -524,8 +524,8 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi public void widgetSelected(SelectionEvent e) { if (model != null) { if (RestartAllAction.confirmRestart()) { - restart(null); - } + restart(null); + } } } }); @@ -537,28 +537,28 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi if (explorerIds.length == 1) { return index; // no other explorer to chosse from } - MenuItem menuItem = new MenuItem(menu, SWT.CASCADE, index++); + MenuItem menuItem = new MenuItem(menu, SWT.CASCADE, index++); - menuItem.setText(Messages.EXPLORER_PULLDOWN_MENU); + menuItem.setText(Messages.EXPLORER_PULLDOWN_MENU); - Menu subMenu = new Menu(menu); - menuItem.setMenu(subMenu); + Menu subMenu = new Menu(menu); + menuItem.setMenu(subMenu); for (final String id : explorerIds) { - TaskExplorerNode node = CheatSheetRegistryReader.getInstance().findTaskExplorer(id); - boolean isCurrentExplorer = id.equals(currentExplorer.getId()); - int style = isCurrentExplorer ? SWT.RADIO: SWT.PUSH; - MenuItem item = new MenuItem(subMenu, style); - item.setText(node.getName()); - item.setSelection(isCurrentExplorer); - item.setImage(TaskExplorerManager.getInstance().getImage(id)); - item.addSelectionListener(new SelectionAdapter() { - @Override + TaskExplorerNode node = CheatSheetRegistryReader.getInstance().findTaskExplorer(id); + boolean isCurrentExplorer = id.equals(currentExplorer.getId()); + int style = isCurrentExplorer ? SWT.RADIO: SWT.PUSH; + MenuItem item = new MenuItem(subMenu, style); + item.setText(node.getName()); + item.setSelection(isCurrentExplorer); + item.setImage(TaskExplorerManager.getInstance().getImage(id)); + item.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { - setCurrentExplorerFromId(id); - } - }); - } + setCurrentExplorerFromId(id); + } + }); + } return index; } @@ -566,7 +566,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi public void restart(Map<String, String> cheatSheetData) { model.resetAllTasks(cheatSheetData); currentExplorer.setSelection - (new StructuredSelection(model.getRootTask()), true); + (new StructuredSelection(model.getRootTask()), true); } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/DescriptionPanel.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/DescriptionPanel.java index 157ebe81c..891b554ac 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/DescriptionPanel.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/DescriptionPanel.java @@ -89,11 +89,11 @@ public class DescriptionPanel { Composite separator = toolkit.createCompositeSeparator(panel); - TableWrapData data = new TableWrapData(); - data.align = TableWrapData.FILL; - data.grabHorizontal = true; - data.maxHeight = 1; - separator.setLayoutData(data); + TableWrapData data = new TableWrapData(); + data.align = TableWrapData.FILL; + data.grabHorizontal = true; + data.maxHeight = 1; + separator.setLayoutData(data); lowerText = mform.getToolkit().createFormText(panel, false); mform.getToolkit().adapt(lowerText, false, false); @@ -128,14 +128,14 @@ public class DescriptionPanel { upperMessage.append("</span></p>"); //$NON-NLS-1$ upperMessage.append(MarkupParser.createParagraph(task.getDescription(), null)); upperMessage.append("</form>"); //$NON-NLS-1$ - upperText.setText(upperMessage.toString(), true, false); + upperText.setText(upperMessage.toString(), true, false); StringBuilder buf = new StringBuilder(); buf.append("<form>"); //$NON-NLS-1$ - boolean startable = false; - boolean isBlocked = false; - boolean isSkippable = ((AbstractTask)task).isSkippable(); + boolean startable = false; + boolean isBlocked = false; + boolean isSkippable = ((AbstractTask)task).isSkippable(); if (task.getState() == ICompositeCheatSheetTask.COMPLETED) { buf.append(MarkupParser.createParagraph(task.getCompletionMessage(), null)); @@ -183,7 +183,7 @@ public class DescriptionPanel { } else { skipMessage = Messages.COMPOSITE_PAGE_SKIP_TASK; } - addHyperlink(buf, CompositeCheatSheetPage.SKIP_HREF, SKIP_IMAGE, skipMessage); + addHyperlink(buf, CompositeCheatSheetPage.SKIP_HREF, SKIP_IMAGE, skipMessage); } if (!startable && !isBlocked) { @@ -237,10 +237,10 @@ public class DescriptionPanel { buf.append(task.getId()); buf.append("\">"); //$NON-NLS-1$ buf.append(NLS.bind(Messages.COMPOSITE_PAGE_TASK_NOT_COMPLETE, (new Object[] - {MarkupParser.escapeText(task.getName())}))); + {MarkupParser.escapeText(task.getName())}))); buf.append("</a>"); //$NON-NLS-1$ buf.append("</li>"); //$NON-NLS-1$ - } + } } private void showSuccesorTaskLinks(ICompositeCheatSheetTask task, StringBuilder buf) { @@ -248,7 +248,7 @@ public class DescriptionPanel { ICompositeCheatSheetTask[] successorTasks = new SuccesorTaskFinder(task).getRecommendedSuccessors(); for (ICompositeCheatSheetTask successor : successorTasks) { String message = NLS.bind(Messages.COMPOSITE_PAGE_GOTO_TASK, (new Object[] - {MarkupParser.escapeText(successor.getName())})); + {MarkupParser.escapeText(successor.getName())})); addHyperlink(buf, CompositeCheatSheetPage.GOTO_TASK_TAG + successor.getId(), GOTO_IMAGE, message); } } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/TaskExplorerManager.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/TaskExplorerManager.java index 3dde0401c..bd0a20316 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/TaskExplorerManager.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/TaskExplorerManager.java @@ -89,7 +89,7 @@ private static TaskExplorerManager instance; if (explorerInfo == null) { return null; } - String iconPath = explorerInfo.getIconPath(); + String iconPath = explorerInfo.getIconPath(); if (iconPath == null) { return null; } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/AbstractExecutable.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/AbstractExecutable.java index 96fb07d51..b2e88675a 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/AbstractExecutable.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/AbstractExecutable.java @@ -99,11 +99,11 @@ public abstract class AbstractExecutable { this.when = when; } - /** - * Handle an attribute specific to this type of AbstractExecutable - * @param attribute - * @return true if this parameter is valid for this type of executable - */ + /** + * Handle an attribute specific to this type of AbstractExecutable + * @param attribute + * @return true if this parameter is valid for this type of executable + */ public abstract boolean handleAttribute(Node attribute); /** diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetCommand.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetCommand.java index 448ba1d75..1e9f5c81c 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetCommand.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetCommand.java @@ -57,9 +57,9 @@ public class CheatSheetCommand extends AbstractExecutable { @Override public boolean handleAttribute(Node attribute) { if (IParserTags.SERIALIZATION.equals(attribute.getNodeName())) { - setSerialization(attribute.getNodeValue()); - serializationFound = true; - return true; + setSerialization(attribute.getNodeValue()); + serializationFound = true; + return true; } else if (IParserTags.RETURNS.equals(attribute.getNodeName())) { setReturns(attribute.getNodeValue()); return true; diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java index b702302c8..98bd50a71 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java @@ -274,7 +274,7 @@ public class CheatSheetParser implements IStatusContainer { throw new CheatSheetParserException(errorMessage); } } - checkForNoChildren(executableNode); + checkForNoChildren(executableNode); executable.setParams(params); item.setExecutable(executable); } @@ -429,7 +429,7 @@ public class CheatSheetParser implements IStatusContainer { Node node = nodes.item(i); if(node.getNodeType() == Node.TEXT_NODE) { String nodeValue = node.getNodeValue(); - if (isLeadingTrimRequired) { + if (isLeadingTrimRequired) { nodeValue = trimLeadingWhitespace(nodeValue); } text.append(nodeValue); @@ -481,7 +481,7 @@ public class CheatSheetParser implements IStatusContainer { firstNonWhitespaceIndex++; } if (firstNonWhitespaceIndex > 0) { - return nodeValue.substring(firstNonWhitespaceIndex, nodeValue.length()); + return nodeValue.substring(firstNonWhitespaceIndex, nodeValue.length()); } return nodeValue; } @@ -496,7 +496,7 @@ public class CheatSheetParser implements IStatusContainer { } String message; if (IParserTags.DESCRIPTION.equals(nodeName)) { - message = NLS.bind(Messages.WARNING_PARSING_DESCRIPTION_UNKNOWN_ELEMENT, (new Object[] {parentNode.getNodeName(), node.getNodeName()})); + message = NLS.bind(Messages.WARNING_PARSING_DESCRIPTION_UNKNOWN_ELEMENT, (new Object[] {parentNode.getNodeName(), node.getNodeName()})); } else { message = NLS.bind(Messages.WARNING_PARSING_ON_COMPLETION_UNKNOWN_ELEMENT, (new Object[] {parentNode.getNodeName(), node.getNodeName()})); } @@ -516,7 +516,7 @@ public class CheatSheetParser implements IStatusContainer { handleIntroAttributes(introItem, introNode); - boolean hasDescription = false; + boolean hasDescription = false; NodeList nodes = introNode.getChildNodes(); for (int i = 0; i < nodes.getLength(); i++) { @@ -527,8 +527,8 @@ public class CheatSheetParser implements IStatusContainer { String message = NLS.bind(Messages.ERROR_PARSING_MULTIPLE_DESCRIPTION, (new Object[] {introNode.getNodeName()})); addStatus(IStatus.ERROR, message, null); } else { - hasDescription = true; - handleDescription(introItem, node); + hasDescription = true; + handleDescription(introItem, node); } } else { if(node.getNodeType() != Node.TEXT_NODE && node.getNodeType() != Node.COMMENT_NODE ) { @@ -595,8 +595,8 @@ public class CheatSheetParser implements IStatusContainer { String message = NLS.bind(Messages.ERROR_PARSING_MULTIPLE_DESCRIPTION, (new Object[] {itemNode.getNodeName()})); addStatus(IStatus.ERROR, message, null); } else { - hasDescription = true; - handleDescription(item, node); + hasDescription = true; + handleDescription(item, node); } } else if(node.getNodeName().equals(IParserTags.ON_COMPLETION)) { handleOnCompletion(item, node); @@ -904,7 +904,7 @@ public class CheatSheetParser implements IStatusContainer { InputStream is = null; InputSource inputSource = null; - String filename = ""; //$NON-NLS-1$ + String filename = ""; //$NON-NLS-1$ URL url = input.getUrl(); if (input.getXml() != null) { @@ -1029,8 +1029,8 @@ public class CheatSheetParser implements IStatusContainer { if (hasIntro) { addStatus(IStatus.ERROR, Messages.ERROR_PARSING_MORE_THAN_ONE_INTRO, null); } else { - hasIntro = true; - handleIntroNode(cheatSheet, node); + hasIntro = true; + handleIntroNode(cheatSheet, node); } } else { if(node.getNodeType() != Node.TEXT_NODE && node.getNodeType() != Node.COMMENT_NODE ) { diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetSaveHelper.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetSaveHelper.java index c7047ba33..cd467917b 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetSaveHelper.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetSaveHelper.java @@ -206,10 +206,10 @@ public class CheatSheetSaveHelper { public IStatus saveState(Properties properties, CheatSheetManager csm) { String csID = (String) properties.get(IParserTags.ID); XMLMemento writeMemento = XMLMemento.createWriteRoot(IParserTags.CHEATSHEET_STATE); - IStatus status = saveToMemento(properties, csm, writeMemento); - if (!status.isOK()) { - return status; - } + IStatus status = saveToMemento(properties, csm, writeMemento); + if (!status.isOK()) { + return status; + } return CheatSheetPlugin.getPlugin().saveMemento(writeMemento, csID + DOT_XML); } @@ -223,7 +223,7 @@ public class CheatSheetSaveHelper { writeMemento.putString(IParserTags.ID, (String)properties.get(IParserTags.ID)); String contentPath = (String)properties.get(IParserTags.CONTENT_URL); if (contentPath != null) { - writeMemento.putString(IParserTags.CONTENT_URL, contentPath); + writeMemento.putString(IParserTags.CONTENT_URL, contentPath); } addListOfStringsToMemento(writeMemento, properties, IParserTags.COMPLETED); @@ -267,7 +267,7 @@ public class CheatSheetSaveHelper { properties.put(IParserTags.ID, memento.getString(IParserTags.ID)); String contentURL = memento.getString(IParserTags.CONTENT_URL); if (contentURL != null) { - properties.put(IParserTags.CONTENT_URL, contentURL); + properties.put(IParserTags.CONTENT_URL, contentURL); } getListOfStringsFromMemento(memento, properties, IParserTags.COMPLETED); diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/IncompatibleSiblingChecker.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/IncompatibleSiblingChecker.java index 02eae0b1c..31fd8d6c4 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/IncompatibleSiblingChecker.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/IncompatibleSiblingChecker.java @@ -26,15 +26,15 @@ import org.w3c.dom.Node; public class IncompatibleSiblingChecker { - private IStatusContainer statusContainer; + private IStatusContainer statusContainer; private Node parentNode; private String existingChild; private boolean errorReported = false; public IncompatibleSiblingChecker(IStatusContainer statusContainer, Node parentNode) { - this.statusContainer = statusContainer; - this.parentNode = parentNode; - } + this.statusContainer = statusContainer; + this.parentNode = parentNode; + } /** * Check to see that adding this new element does not create an error based on @@ -59,14 +59,14 @@ public class IncompatibleSiblingChecker { private boolean isSubitem(String elementKind) { return IParserTags.SUBITEM.equals(elementKind) - || IParserTags.CONDITIONALSUBITEM.equals(elementKind) - || IParserTags.REPEATEDSUBITM.equals(elementKind); + || IParserTags.CONDITIONALSUBITEM.equals(elementKind) + || IParserTags.REPEATEDSUBITM.equals(elementKind); } private boolean isExecutable(String elementKind) { return IParserTags.ACTION.equals(elementKind) - || IParserTags.COMMAND.equals(elementKind) - || IParserTags.PERFORMWHEN.equals(elementKind); + || IParserTags.COMMAND.equals(elementKind) + || IParserTags.PERFORMWHEN.equals(elementKind); } private void reportIncompatible(String elementKind) { @@ -75,11 +75,11 @@ public class IncompatibleSiblingChecker { } errorReported = true; String message; - if (elementKind.equals(existingChild)) { - message = NLS.bind(Messages.ERROR_PARSING_DUPLICATE_CHILD, (new Object[] {parentNode.getNodeName(), elementKind})); - } else { - message = NLS.bind(Messages.ERROR_PARSING_INCOMPATIBLE_CHILDREN, (new Object[] {parentNode.getNodeName(), existingChild, elementKind})); - } - statusContainer.addStatus(IStatus.ERROR, message, null); + if (elementKind.equals(existingChild)) { + message = NLS.bind(Messages.ERROR_PARSING_DUPLICATE_CHILD, (new Object[] {parentNode.getNodeName(), elementKind})); + } else { + message = NLS.bind(Messages.ERROR_PARSING_INCOMPATIBLE_CHILDREN, (new Object[] {parentNode.getNodeName(), existingChild, elementKind})); + } + statusContainer.addStatus(IStatus.ERROR, message, null); } } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/dialogs/CheatSheetCategoryBasedSelectionDialog.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/dialogs/CheatSheetCategoryBasedSelectionDialog.java index 761425003..9570ba265 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/dialogs/CheatSheetCategoryBasedSelectionDialog.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/dialogs/CheatSheetCategoryBasedSelectionDialog.java @@ -295,7 +295,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends } }); - // Create radio button for select from file + // Create radio button for select from file selectFileRadio = new Button(outerContainer, SWT.RADIO); selectFileRadio.setText(Messages.SELECTION_DIALOG_OPEN_FROM_FILE); @@ -582,26 +582,26 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends String id = filePath.lastSegment(); int extensionIndex = id.indexOf('.'); if (extensionIndex > 0) { - id = id.substring(0, extensionIndex); + id = id.substring(0, extensionIndex); } // Use the id as the name URL url = null; boolean opened = false; try { - File contentFile = new File(selectFileCombo.getText()); - url = contentFile.toURI().toURL(); - new OpenCheatSheetAction(id, id ,url).run(); - opened = true; - } catch (MalformedURLException e) { - opened = false; - } - if (!opened) { - String message = NLS.bind(Messages.ERROR_OPENING_FILE, (new Object[] {selectFileCombo.getText()})); - status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, ParserStatusUtility.PARSER_ERROR, message, null); - CheatSheetView view = ViewUtilities.showCheatSheetView(); - view.getCheatSheetViewer().showError(message); - } + File contentFile = new File(selectFileCombo.getText()); + url = contentFile.toURI().toURL(); + new OpenCheatSheetAction(id, id ,url).run(); + opened = true; + } catch (MalformedURLException e) { + opened = false; + } + if (!opened) { + String message = NLS.bind(Messages.ERROR_OPENING_FILE, (new Object[] {selectFileCombo.getText()})); + status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, ParserStatusUtility.PARSER_ERROR, message, null); + CheatSheetView view = ViewUtilities.showCheatSheetView(); + view.getCheatSheetViewer().showError(message); + } } private void setResultFromUrl() { @@ -613,7 +613,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends } int extensionIndex = id.indexOf('.'); if (extensionIndex > 0) { - id = id.substring(0, extensionIndex); + id = id.substring(0, extensionIndex); } // Use the id as the name URL url = null; @@ -625,15 +625,15 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends try { url = new URL(selectUrlCombo.getText()); view.getCheatSheetViewer().setInput(id, id, url, new DefaultStateManager(), true); - opened = true; - } catch (MalformedURLException e) { - opened = false; - } - if (!opened) { - String message = NLS.bind(Messages.ERROR_OPENING_FILE, (new Object[] {selectUrlCombo.getText()})); - status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, ParserStatusUtility.PARSER_ERROR, message, null); - view.getCheatSheetViewer().showError(message); - } + opened = true; + } catch (MalformedURLException e) { + opened = false; + } + if (!opened) { + String message = NLS.bind(Messages.ERROR_OPENING_FILE, (new Object[] {selectUrlCombo.getText()})); + status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, ParserStatusUtility.PARSER_ERROR, message, null); + view.getCheatSheetViewer().showError(message); + } } /** @@ -657,7 +657,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends private void restoreFileSettings() { int radioSetting = RADIO_REGISTERED; try { - radioSetting = settings.getInt(STORE_RADIO_SETTING); + radioSetting = settings.getInt(STORE_RADIO_SETTING); } catch(NumberFormatException n) { } @@ -688,12 +688,12 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends private void saveMRU(List<String> mostRecentList, String key, String selection) { if (selection.length() > 0 && !mostRecentList.contains(selection)) { - mostRecentList.add(0, selection); + mostRecentList.add(0, selection); } for (int i = 0; i < MOST_RECENT_LENGTH & i < mostRecentList.size(); i++) { String name = mostRecentList.get(i); if (name.length() > 0) { - settings.put(key + i, name); + settings.put(key + i, name); } } } @@ -796,12 +796,12 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends @Override protected IDialogSettings getDialogBoundsSettings() { - IDialogSettings settings = CheatSheetPlugin.getPlugin().getDialogSettings(); - IDialogSettings section = settings.getSection(DIALOG_SETTINGS_SECTION); - if (section == null) { - section = settings.addNewSection(DIALOG_SETTINGS_SECTION); - } - return section; + IDialogSettings settings = CheatSheetPlugin.getPlugin().getDialogSettings(); + IDialogSettings section = settings.getSection(DIALOG_SETTINGS_SECTION); + if (section == null) { + section = settings.addNewSection(DIALOG_SETTINGS_SECTION); + } + return section; } private Label createMessageArea(Composite composite) { diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetElement.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetElement.java index 3e9cb5d00..c55c21ab2 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetElement.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetElement.java @@ -217,7 +217,7 @@ public class CheatSheetElement extends WorkbenchAdapter implements IAdaptable, I */ public String getRestorePath() { if (!registered) { - return contentFile; + return contentFile; } return null; } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java index 8ece31d19..5a2a366c3 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java @@ -62,7 +62,7 @@ public class CheatSheetRegistryReader extends RegistryReader implements IRegistr } /** - * Represents a taskEditor entry in the registry + * Represents a taskEditor entry in the registry */ public class TaskEditorNode { private String className; @@ -96,7 +96,7 @@ public class CheatSheetRegistryReader extends RegistryReader implements IRegistr } /** - * Represents a taskExplorer entry in the registry + * Represents a taskExplorer entry in the registry */ public class TaskExplorerNode { private String className; @@ -156,9 +156,9 @@ public class CheatSheetRegistryReader extends RegistryReader implements IRegistr protected final static String trueString = "TRUE"; //$NON-NLS-1$ private final static String UNCATEGORIZED_CHEATSHEET_CATEGORY = "org.eclipse.ui.Other"; //$NON-NLS-1$ private final static String UNCATEGORIZED_CHEATSHEET_CATEGORY_LABEL = Messages.CHEAT_SHEET_OTHER_CATEGORY; - public final static String CHEAT_SHEET_CONTENT = "cheatSheetContent"; //$NON-NLS-1$ + public final static String CHEAT_SHEET_CONTENT = "cheatSheetContent"; //$NON-NLS-1$ - /** + /** * Returns a list of cheatsheets, project and not. * * The return value for this method is cached since computing its value @@ -294,7 +294,7 @@ public class CheatSheetRegistryReader extends RegistryReader implements IRegistr */ public TaskEditorNode findTaskEditor(String id) { if (cheatsheets == null) { - readCheatSheets(); // Ensure that the registry has been read + readCheatSheets(); // Ensure that the registry has been read } return taskEditors.get(id); } @@ -305,7 +305,7 @@ public class CheatSheetRegistryReader extends RegistryReader implements IRegistr */ public TaskExplorerNode findTaskExplorer(String id) { if (cheatsheets == null) { - readCheatSheets(); // Ensure that the registry has been read + readCheatSheets(); // Ensure that the registry has been read } return taskExplorers.get(id); } @@ -316,7 +316,7 @@ public class CheatSheetRegistryReader extends RegistryReader implements IRegistr */ public String[] getExplorerIds() { if (cheatsheets == null) { - readCheatSheets(); // Ensure that the registry has been read + readCheatSheets(); // Ensure that the registry has been read } Set<String> keys = taskExplorers.keySet(); return keys.toArray(new String[keys.size()]); @@ -430,7 +430,7 @@ public class CheatSheetRegistryReader extends RegistryReader implements IRegistr currentCollectionElement = (CheatSheetCollectionElement) nestedCategoryIds.get(category); currentCollectionElement.add(element); } else { - moveElementToUncategorizedCategory(currentResult, element); + moveElementToUncategorizedCategory(currentResult, element); } } else { currentCollectionElement.add(element); @@ -636,7 +636,7 @@ public class CheatSheetRegistryReader extends RegistryReader implements IRegistr String pluginId = element.getContributor().getName(); if (id != null && className != null && name != null ) { TaskExplorerNode node = new TaskExplorerNode(); - node.setId(id); + node.setId(id); node.setIconPath(icon); node.setClassName(className); node.setName(name); @@ -652,7 +652,7 @@ public class CheatSheetRegistryReader extends RegistryReader implements IRegistr String pluginId = element.getContributor().getName(); if (id != null && className != null && icon != null ) { TaskEditorNode node = new TaskEditorNode(); - node.setId(id); + node.setId(id); node.setIconPath(icon); node.setClassName(className); node.setPluginId(pluginId); diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/TrayStateManager.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/TrayStateManager.java index fc20c1700..900884468 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/TrayStateManager.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/TrayStateManager.java @@ -39,7 +39,7 @@ public class TrayStateManager implements ICheatSheetStateManager { @Override public void setElement(CheatSheetElement element) { - // element not used + // element not used } @Override @@ -53,7 +53,7 @@ public class TrayStateManager implements ICheatSheetStateManager { */ @Override public IStatus saveState(Properties properties, CheatSheetManager manager) { - this.properties = properties; + this.properties = properties; this.manager = manager; return Status.OK_STATUS; } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetManager.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetManager.java index a1f70071c..df30be769 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetManager.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetManager.java @@ -55,7 +55,7 @@ public class CheatSheetManager implements ICheatSheetManager { public void fireEvent(int eventType) { // Send an event to every listener for (CheatSheetListener listener : listeners) { - ICheatSheetEvent event = new CheatSheetEvent(eventType, cheatsheetID, this); + ICheatSheetEvent event = new CheatSheetEvent(eventType, cheatsheetID, this); listener.cheatSheetEvent(event); } } @@ -105,13 +105,13 @@ public class CheatSheetManager implements ICheatSheetManager { return result; } - /** - * Substitute occurences of ${data} with values from the cheatsheetmanager. - * @param input The input string - * @param csm The cheatsheet manager - * @return The input string with substitutions made for any cheatsheet - * variables encountered. - */ + /** + * Substitute occurences of ${data} with values from the cheatsheetmanager. + * @param input The input string + * @param csm The cheatsheet manager + * @return The input string with substitutions made for any cheatsheet + * variables encountered. + */ public String performVariableSubstitution(String input) { String remaining = input; @@ -123,14 +123,14 @@ public class CheatSheetManager implements ICheatSheetManager { output += remaining; remaining = ""; //$NON-NLS-1$ } else { - String varName = remaining.substring(varIndex + VARIABLE_BEGIN.length(), - endIndex); - String value = getDataQualified(varName); - output += remaining.substring(0, varIndex); - if (value != null) { - output += value; - } - remaining = remaining.substring(endIndex + VARIABLE_END.length()); + String varName = remaining.substring(varIndex + VARIABLE_BEGIN.length(), + endIndex); + String value = getDataQualified(varName); + output += remaining.substring(0, varIndex); + if (value != null) { + output += value; + } + remaining = remaining.substring(endIndex + VARIABLE_END.length()); } } return output; @@ -181,7 +181,7 @@ public class CheatSheetManager implements ICheatSheetManager { */ public void addListener(CheatSheetListener listener) { if (listener != null) { - listeners.add(listener); + listeners.add(listener); } } @@ -199,7 +199,7 @@ public class CheatSheetManager implements ICheatSheetManager { if (dataTable == null) { return new HashSet<>(); } else { - return dataTable.keySet(); + return dataTable.keySet(); } } } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetPage.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetPage.java index f2b96e0e3..cb8b24b32 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetPage.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetPage.java @@ -205,20 +205,20 @@ public class CheatSheetPage extends Page implements IMenuContributor { } private void computeReverseVideoColors(Display display) { - Color background = toolkit.getColors().getBackground(); + Color background = toolkit.getColors().getBackground(); RGB white = new RGB(255, 255, 255); - // Create new colors, they will get disposed - RGB rgb = background.getRGB(); + // Create new colors, they will get disposed + RGB rgb = background.getRGB(); activeColor = new Color(display, rgb ); rgb = FormColors.blend(rgb, white, 85); inactiveColor1 = new Color(display, rgb); rgb = FormColors.blend(rgb, white, 85); inactiveColor2 = new Color(display, rgb ); - introColor = new Color(display, rgb ); + introColor = new Color(display, rgb ); } private boolean isReverseVideo() { - Color bg = toolkit.getColors().getBackground(); + Color bg = toolkit.getColors().getBackground(); return ((bg.getBlue() + bg.getRed() + bg.getGreen()) < 380); } 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); } } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CoreItem.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CoreItem.java index c473587c1..57dc7c663 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CoreItem.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CoreItem.java @@ -255,10 +255,10 @@ public class CoreItem extends ViewItem { separatorData.valign = TableWrapData.MIDDLE; separator.setLayoutData(separatorData); for (int i = 3; i <= SUBITEM_COLUMNS; i++) { - Label filler = page.getToolkit().createLabel(buttonComposite, null); - TableWrapData fillerData = new TableWrapData(); - fillerData.maxWidth = 0; - filler.setLayoutData(fillerData); + Label filler = page.getToolkit().createLabel(buttonComposite, null); + TableWrapData fillerData = new TableWrapData(); + fillerData.maxWidth = 0; + filler.setLayoutData(fillerData); } } @@ -531,7 +531,7 @@ public class CoreItem extends ViewItem { } if ( status.getSeverity() == IStatus.ERROR) { CheatSheetPlugin.getPlugin().getLog().log(status); - org.eclipse.jface.dialogs.ErrorDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), null, null, status); + org.eclipse.jface.dialogs.ErrorDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), null, null, status); } return VIEWITEM_DONOT_ADVANCE; } finally { @@ -574,7 +574,7 @@ public class CoreItem extends ViewItem { if (startButton != null) { startButton.setImage(CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_RESTART)); startButton.setText(Messages.RESTART_TASK_TOOLTIP); - startButton.setToolTipText(Messages.RESTART_TASK_TOOLTIP); + startButton.setToolTipText(Messages.RESTART_TASK_TOOLTIP); } } @@ -584,9 +584,9 @@ public class CoreItem extends ViewItem { if (startButton != null) { startButton.setImage(CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_START)); if (startButton.getText() != null) { - startButton.setText(Messages.PERFORM_TASK_TOOLTIP); + startButton.setText(Messages.PERFORM_TASK_TOOLTIP); } - startButton.setToolTipText(Messages.PERFORM_TASK_TOOLTIP); + startButton.setToolTipText(Messages.PERFORM_TASK_TOOLTIP); } } @@ -599,7 +599,7 @@ public class CoreItem extends ViewItem { @Override void createCompletionComposite(boolean isFinalItem) { String completionMessage = viewer.getManager().performVariableSubstitution - (item.getCompletionMessage()); + (item.getCompletionMessage()); if (completionMessage != null) { Color backgroundColor = bodyWrapperComposite.getBackground(); completionComposite = page.getToolkit().createComposite( @@ -673,25 +673,25 @@ public class CoreItem extends ViewItem { ArrayList<SubItemCompositeHolder> list = getListOfSubItemCompositeHolders(); Control subitemLabel = null; SubItemCompositeHolder holder = null; - if (list != null) { + if (list != null) { for (Iterator<SubItemCompositeHolder> iter = list.iterator(); iter.hasNext() && subitemLabel == null;) { holder = iter.next(); - if (!holder.isCompleted() && !holder.isSkipped()) { - subitemLabel = holder.getSubitemLabel(); - } - } - } - if (subitemLabel != null) { - FormToolkit.ensureVisible(subitemLabel); - if (holder.getStartButton() != null) { - holder.getStartButton().setFocus(); - } else if (holder.getCompleteButton() != null) { - holder.getCompleteButton().setFocus(); - } - } else { - FormToolkit.ensureVisible(getMainItemComposite()); - super.setFocus(); - } + if (!holder.isCompleted() && !holder.isSkipped()) { + subitemLabel = holder.getSubitemLabel(); + } + } + } + if (subitemLabel != null) { + FormToolkit.ensureVisible(subitemLabel); + if (holder.getStartButton() != null) { + holder.getStartButton().setFocus(); + } else if (holder.getCompleteButton() != null) { + holder.getCompleteButton().setFocus(); + } + } else { + FormToolkit.ensureVisible(getMainItemComposite()); + super.setFocus(); + } } } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ErrorPage.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ErrorPage.java index 25b9ab2ea..9ab6ca9bf 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ErrorPage.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ErrorPage.java @@ -115,20 +115,20 @@ public class ErrorPage extends Page { } /** - * Return the image for a status message - * - * @return - */ - private Image getImage(int severity) { - switch(severity) { - case IStatus.ERROR: - return CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.ERROR); - case IStatus.WARNING: - return CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.WARNING); - default: - return CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.INFORMATION); - } - } + * Return the image for a status message + * + * @return + */ + private Image getImage(int severity) { + switch(severity) { + case IStatus.ERROR: + return CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.ERROR); + case IStatus.WARNING: + return CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.WARNING); + default: + return CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.INFORMATION); + } + } /** * Creates the cheatsheet's title areawhich will consists diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ViewItem.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ViewItem.java index fbe0b91fe..bc98a0ca2 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ViewItem.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ViewItem.java @@ -359,14 +359,14 @@ public abstract class ViewItem { } public boolean isCompletionMessageExpanded() { - return completionMessageExpanded; - } + return completionMessageExpanded; + } /** - * Returns whether or not cheat sheet viewer containing this item is in - * a modal dialog. - * - * @return whether the cheat sheet viewer is in a modal dialog + * Returns whether or not cheat sheet viewer containing this item is in + * a modal dialog. + * + * @return whether the cheat sheet viewer is in a modal dialog */ public boolean isInDialogMode() { return viewer.isInDialogMode(); @@ -403,7 +403,7 @@ public abstract class ViewItem { Point point = widget.getDisplay().getCursorLocation(); point = new Point(point.x + 15, point.y); // display the help - PlatformUI.getWorkbench().getHelpSystem().displayContext(context, point.x, point.y); + PlatformUI.getWorkbench().getHelpSystem().displayContext(context, point.x, point.y); } } @@ -618,6 +618,6 @@ public abstract class ViewItem { bodyText.copy(); } - abstract boolean hasCompletionMessage(); + abstract boolean hasCompletionMessage(); } |