394772: Not enable exception when starting eclipse
Change-Id: Ic14e94c53ca366b743b9e7ecd30cfb73d935dd33
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=394772
Signed-off-by: sdubois <sebastien.dubois@ericsson.com>
Change command handlers to make sure we disable the navigator view at
beginning
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/plugin.xml b/org.eclipse.mylyn.reviews.r4e.ui/plugin.xml
index abba54d..0ecc6c1 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/plugin.xml
+++ b/org.eclipse.mylyn.reviews.r4e.ui/plugin.xml
@@ -1020,11 +1020,6 @@
<handler
class="org.eclipse.mylyn.reviews.r4e.ui.internal.commands.handlers.RefreshHandler"
commandId="org.eclipse.mylyn.reviews.r4e.ui.commands.Refresh">
- <enabledWhen>
- <test
- property="org.eclipse.mylyn.reviews.r4e.ui.commands.dialog.dialogOpen">
- </test>
- </enabledWhen>
</handler>
<handler
class="org.eclipse.mylyn.reviews.r4e.ui.internal.commands.handlers.ExpandAllHandler"
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/AddAssignHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/AddAssignHandler.java
index 92f73cf..26bffb7 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/AddAssignHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/AddAssignHandler.java
@@ -75,6 +75,7 @@
@Override
public IStatus run(IProgressMonitor monitor) {
+ R4EUIModelController.setJobInProgress(true);
if (!selectedElements.isEmpty()) {
//Get participants to assign
@@ -83,7 +84,6 @@
//Assign them
if (participants.size() > 0) {
monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
- R4EUIModelController.setJobInProgress(true);
for (IR4EUIModelElement element : selectedElements) {
R4EUIPlugin.Ftracer.traceInfo("Add Assignees..." + element.getName()); //$NON-NLS-1$
@@ -96,10 +96,10 @@
return Status.CANCEL_STATUS;
}
}
- R4EUIModelController.setJobInProgress(false);
}
UIUtils.setNavigatorViewFocus(selectedElements.get(0), 0);
}
+ R4EUIModelController.setJobInProgress(false);
monitor.done();
return Status.OK_STATUS;
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ChangeReviewStateHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ChangeReviewStateHandler.java
index 51ad63e..02a6afe 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ChangeReviewStateHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ChangeReviewStateHandler.java
@@ -88,9 +88,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
if (!selectedElements.isEmpty()) {
-
- monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
Resource resource = null;
try {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloneAnomalyHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloneAnomalyHandler.java
index e898bc2..a4ad200 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloneAnomalyHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloneAnomalyHandler.java
@@ -96,8 +96,8 @@
public IStatus run(IProgressMonitor monitor) {
//Act differently depending on the type of selection we get
- final ISelection selection = HandlerUtil.getCurrentSelection(event);
R4EUIModelController.setJobInProgress(true);
+ final ISelection selection = HandlerUtil.getCurrentSelection(event);
if (selection instanceof ITextSelection) {
monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloseElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloseElementHandler.java
index 66e90e0..986ab71 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloseElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloseElementHandler.java
@@ -73,16 +73,16 @@
@Override
public IStatus run(IProgressMonitor monitor) {
+ R4EUIModelController.setJobInProgress(true);
monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
if (!selectedElements.isEmpty()) {
- R4EUIModelController.setJobInProgress(true);
final IR4EUIModelElement element = selectedElements.get(0);
R4EUIPlugin.Ftracer.traceInfo("Closing element " + element.getName()); //$NON-NLS-1$
element.close();
- R4EUIModelController.setJobInProgress(false);
UIUtils.setNavigatorViewFocus(element, 0);
}
+ R4EUIModelController.setJobInProgress(false);
monitor.done();
return Status.OK_STATUS;
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ImportPostponedHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ImportPostponedHandler.java
index 9ae51a0..d3598ec 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ImportPostponedHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ImportPostponedHandler.java
@@ -96,11 +96,10 @@
@Override
public IStatus run(IProgressMonitor monitor) {
+ R4EUIModelController.setJobInProgress(true);
final R4EUIReviewGroup parentGroup = (R4EUIReviewGroup) R4EUIModelController.getActiveReview()
.getParent();
-
monitor.beginTask(COMMAND_MESSAGE, parentGroup.getChildren().length);
- R4EUIModelController.setJobInProgress(true);
importPostponedElements(true, monitor);
R4EUIModelController.setJobInProgress(false);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewAnomalyHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewAnomalyHandler.java
index c0cda28..4015dec 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewAnomalyHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewAnomalyHandler.java
@@ -96,8 +96,8 @@
public IStatus run(IProgressMonitor monitor) {
//Act differently depending on the type of selection we get
- final ISelection selection = HandlerUtil.getCurrentSelection(event);
R4EUIModelController.setJobInProgress(true);
+ final ISelection selection = HandlerUtil.getCurrentSelection(event);
if (selection instanceof ITextSelection) {
monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java
index fcb4992..b9c860b 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java
@@ -88,8 +88,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
for (final ReviewComponent tempModelComponent : tempModelComponents) {
R4EUIPlugin.Ftracer.traceInfo("Adding child to element " + element.getName());
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewLinkedAnomalyHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewLinkedAnomalyHandler.java
index 150c157..6195a06 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewLinkedAnomalyHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewLinkedAnomalyHandler.java
@@ -77,8 +77,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
//Add a linked anomaly to the selected contents
if (!selectedElements.isEmpty()) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewReviewItemHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewReviewItemHandler.java
index ce79d33..389eaf0 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewReviewItemHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewReviewItemHandler.java
@@ -117,8 +117,8 @@
final Job job = new Job(COMMAND_MESSAGE) {
@Override
public IStatus run(IProgressMonitor monitor) {
- final ISelection selection = HandlerUtil.getCurrentSelection(event);
R4EUIModelController.setJobInProgress(true);
+ final ISelection selection = HandlerUtil.getCurrentSelection(event);
//Act differently depending on the type of selection we get
if (selection instanceof ITextSelection) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewRuleSetElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewRuleSetElementHandler.java
index 6242714..cab27ed 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewRuleSetElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewRuleSetElementHandler.java
@@ -88,8 +88,8 @@
final Job job = new Job(COMMAND_MESSAGE) {
@Override
public IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
IR4EUIModelElement newElement = null;
try {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NextStateHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NextStateHandler.java
index 74a886b..d34a2b7 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NextStateHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NextStateHandler.java
@@ -89,8 +89,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
if (!selectedElements.isEmpty()) {
- monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
for (IR4EUIModelElement element : selectedElements) {
R4EUIPlugin.Ftracer.traceInfo("Progressing state for element " + element.getName()); //$NON-NLS-1$
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/OpenElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/OpenElementHandler.java
index f6e1930..eecdcbc 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/OpenElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/OpenElementHandler.java
@@ -79,8 +79,8 @@
@Override
public IStatus run(IProgressMonitor aMonitor) {
- aMonitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
R4EUIModelController.setJobInProgress(true);
+ aMonitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
if (!selectedElements.isEmpty()) {
IR4EUIModelElement element = null;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/PreviousStateHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/PreviousStateHandler.java
index 809b027..5b1fcf1 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/PreviousStateHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/PreviousStateHandler.java
@@ -83,8 +83,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
if (!selectedElements.isEmpty()) {
- monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
for (IR4EUIModelElement element : selectedElements) {
R4EUIPlugin.Ftracer.traceInfo("Regressing State for element " + element.getName()); //$NON-NLS-1$
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveAssignHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveAssignHandler.java
index 9e3a65f..c10cb3b 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveAssignHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveAssignHandler.java
@@ -76,6 +76,7 @@
@Override
public IStatus run(IProgressMonitor monitor) {
+ R4EUIModelController.setJobInProgress(true);
if (!selectedElements.isEmpty()) {
//Get participants to assign
@@ -84,7 +85,6 @@
//Unassign them
if (participants.size() > 0) {
monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
- R4EUIModelController.setJobInProgress(true);
for (IR4EUIModelElement element : selectedElements) {
R4EUIPlugin.Ftracer.traceInfo("Remove Assignees..." //$NON-NLS-1$
@@ -99,10 +99,10 @@
}
}
}
- R4EUIModelController.setJobInProgress(false);
UIUtils.setNavigatorViewFocus(selectedElements.get(0), 0);
R4EUIDialogFactory.getInstance().removeParticipantUnassignDialog();
}
+ R4EUIModelController.setJobInProgress(false);
monitor.done();
return Status.OK_STATUS;
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveElementHandler.java
index 0833ed7..493912e 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveElementHandler.java
@@ -91,8 +91,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
if (!selectedElements.isEmpty()) {
- monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
R4EReview review = null;
if (null != R4EUIModelController.getActiveReview()) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ReportElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ReportElementHandler.java
index 092099a..c1db184 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ReportElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ReportElementHandler.java
@@ -77,8 +77,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
if (!selectedElements.isEmpty()) {
String groupFile = null;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RestoreElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RestoreElementHandler.java
index af9e6f0..43b76dc 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RestoreElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RestoreElementHandler.java
@@ -89,9 +89,10 @@
@Override
public IStatus run(IProgressMonitor monitor) {
+ R4EUIModelController.setJobInProgress(true);
+
if (!selectedElements.isEmpty()) {
monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
- R4EUIModelController.setJobInProgress(true);
R4EReview review = null;
if (null != R4EUIModelController.getActiveReview()) {
