diff options
author | donald.g.dunne | 2016-02-08 17:21:31 +0000 |
---|---|---|
committer | donald.g.dunne | 2016-02-08 17:21:31 +0000 |
commit | fbb119ec50ee190493b6b124c76b8f4a5f169497 (patch) | |
tree | 50dc77a69cfaee54bb7b14ba2803ed6e0638d103 | |
parent | 6438426a07509acb0530a9924985585390c239d7 (diff) | |
download | org.eclipse.osee-fbb119ec50ee190493b6b124c76b8f4a5f169497.tar.gz org.eclipse.osee-fbb119ec50ee190493b6b124c76b8f4a5f169497.tar.xz org.eclipse.osee-fbb119ec50ee190493b6b124c76b8f4a5f169497.zip |
bug[ats_ATS271836]: Refreshing task editor causes parent editor to re-open
Change-Id: Iff3ef2e5cb10cf75c75e58f2545e4c1a8d4ecc57
-rw-r--r-- | plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorArtifactEventManager.java | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorArtifactEventManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorArtifactEventManager.java index 019ad4d86dd..84132f44a4e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorArtifactEventManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorArtifactEventManager.java @@ -44,7 +44,7 @@ import org.eclipse.osee.framework.ui.swt.Displays; /** * Common location for event handling for SMAEditors in order to keep number of registrations and processing to a * minimum. - * + * * @author Donald G. Dunne */ public class SMAEditorArtifactEventManager implements IArtifactEventListener { @@ -119,12 +119,17 @@ public class SMAEditorArtifactEventManager implements IArtifactEventListener { public void run() { handler.getSMAEditor().refreshPages(); } - }); } else if (isReloaded(artifactEvent, awa)) { - SMAEditor.close(Collections.singleton(awa), false); - if (!awa.isDeleted()) { - SMAEditor.editArtifact(awa); + if (awa.isDeleted()) { + SMAEditor.close(Collections.singleton(awa), false); + } else { + Displays.ensureInDisplayThread(new Runnable() { + @Override + public void run() { + handler.getSMAEditor().refreshPages(); + } + }); } } if (!refreshed && awa.isTeamWorkflow() && ReviewManager.hasReviews((TeamWorkFlowArtifact) awa)) { @@ -173,7 +178,8 @@ public class SMAEditorArtifactEventManager implements IArtifactEventListener { // list of actionable items when a sibling changes for (TeamWorkFlowArtifact teamWf : ActionManager.getTeams(awa.getParentActionArtifact())) { ActionArtifact parentAction = teamWf.getParentActionArtifact(); - if (!awa.equals(teamWf) && (artifactEvent.isHasEvent(teamWf) && (parentAction != null && artifactEvent.isRelAddedChangedDeleted(parentAction)))) { + if (!awa.equals(teamWf) && (artifactEvent.isHasEvent( + teamWf) && (parentAction != null && artifactEvent.isRelAddedChangedDeleted(parentAction)))) { refreshed = true; Displays.ensureInDisplayThread(new Runnable() { @Override @@ -213,7 +219,7 @@ public class SMAEditorArtifactEventManager implements IArtifactEventListener { // If relation is parallel config and guid is one of parallel configured versions if (relation.is(AtsRelationTypes.ParallelVersion_Child) && (relation.getArtA().getGuid().equals( AtsUtilCore.getGuid(version)) || relation.getArtB().getGuid().equals( - AtsUtilCore.getGuid(version)))) { + AtsUtilCore.getGuid(version)))) { changed = true; break; } |