diff options
| author | ddunne | 2010-06-18 22:29:57 +0000 |
|---|---|---|
| committer | ddunne | 2010-06-18 22:29:57 +0000 |
| commit | 802421ddd82dcd8bac36286424f9d7d91c28fcf3 (patch) | |
| tree | dc8f9fdfa6b315fab1436680ab7d043ffa06bf53 /plugins | |
| parent | 02efd94255caaa0183a84603cd21acc515a1be43 (diff) | |
| download | org.eclipse.osee-802421ddd82dcd8bac36286424f9d7d91c28fcf3.tar.gz org.eclipse.osee-802421ddd82dcd8bac36286424f9d7d91c28fcf3.tar.xz org.eclipse.osee-802421ddd82dcd8bac36286424f9d7d91c28fcf3.zip | |
Events - UI
Diffstat (limited to 'plugins')
30 files changed, 320 insertions, 335 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsCacheManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsCacheManager.java index a5d598e9b1c..ae8d3e31668 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsCacheManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsCacheManager.java @@ -40,12 +40,13 @@ import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventLi import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.Sender;
import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData.ChangeType;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventManager;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventUtil;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRelation;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactListener;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactEventListener;
import org.eclipse.osee.framework.skynet.core.event2.filter.FilteredEventListener;
import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
import org.eclipse.osee.framework.skynet.core.utility.DbUtil;
@@ -68,7 +69,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition. *
* @author Donald G. Dunne
*/
-public class AtsCacheManager implements IArtifactListener, IArtifactsPurgedEventListener, IFrameworkTransactionEventListener {
+public class AtsCacheManager implements IArtifactEventListener, IArtifactsPurgedEventListener, IFrameworkTransactionEventListener {
private static Map<TaskableStateMachineArtifact, Collection<TaskArtifact>> teamTasksCache =
new HashMap<TaskableStateMachineArtifact, Collection<TaskArtifact>>();
@@ -217,13 +218,13 @@ public class AtsCacheManager implements IArtifactListener, IArtifactsPurgedEvent }
@Override
- public void handleArtifactModified(Collection<EventBasicGuidArtifact> eventArtifacts, Collection<EventBasicGuidRelation> eventRelations, Sender sender) {
+ public void handleArtifactEvent(ArtifactEvent artifactEvent, Sender sender) {
if (DbUtil.isDbInit()) {
OseeEventManager.removeListener(this);
return;
}
try {
- for (EventBasicGuidArtifact guidArt : eventArtifacts) {
+ for (EventBasicGuidArtifact guidArt : artifactEvent.getArtifacts()) {
try {
if (guidArt.is(EventModType.Deleted, EventModType.Purged)) {
if (guidArt.is(CoreArtifactTypes.WorkRuleDefinition, CoreArtifactTypes.WorkPageDefinition,
@@ -277,7 +278,7 @@ public class AtsCacheManager implements IArtifactListener, IArtifactsPurgedEvent OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE, ex);
}
}
- for (EventBasicGuidRelation guidRel : eventRelations) {
+ for (EventBasicGuidRelation guidRel : artifactEvent.getRelations()) {
try {
if (guidRel.is(AtsRelationTypes.SmaToTask_Task)) {
for (TaskArtifact taskArt : ArtifactCache.getActive(guidRel, TaskArtifact.class)) {
@@ -294,7 +295,7 @@ public class AtsCacheManager implements IArtifactListener, IArtifactsPurgedEvent }
}
for (Artifact artifact : FrameworkEventUtil.getArtifactsInRelations(CoreRelationTypes.WorkItem__Child,
- eventRelations, RelationEventType.Added, RelationEventType.Undeleted)) {
+ artifactEvent.getRelations(), RelationEventType.Added, RelationEventType.Undeleted)) {
if (artifact.isOfType(CoreArtifactTypes.WorkRuleDefinition)) {
WorkItemDefinitionFactory.cacheWorkItemDefinitionArtifact(WriteType.Update, new WorkRuleDefinition(
artifact), artifact);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java index ef48d5bcf05..51c57e21aad 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java @@ -58,13 +58,11 @@ import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener; import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
import org.eclipse.osee.framework.skynet.core.event.IRelationModifiedEventListener;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event.RemoteEventManager2;
import org.eclipse.osee.framework.skynet.core.event.Sender;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventManager;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventUtil;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRelation;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactListener;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactEventListener;
import org.eclipse.osee.framework.skynet.core.event2.filter.ArtifactTypeEventFilter;
import org.eclipse.osee.framework.skynet.core.event2.filter.BranchGuidEventFilter;
import org.eclipse.osee.framework.skynet.core.event2.filter.FilteredEventListener;
@@ -110,7 +108,7 @@ import org.eclipse.ui.part.MultiPageEditorPart; /**
* @author Donald G. Dunne
*/
-public class SMAEditor extends AbstractArtifactEditor implements IArtifactListener, ISelectedAtsArtifacts, IDirtiableEditor, IActionable, IArtifactReloadEventListener, IAtsMetricsProvider, IArtifactsPurgedEventListener, IRelationModifiedEventListener, IFrameworkTransactionEventListener, IBranchEventListener, IXTaskViewer {
+public class SMAEditor extends AbstractArtifactEditor implements IArtifactEventListener, ISelectedAtsArtifacts, IDirtiableEditor, IActionable, IArtifactReloadEventListener, IAtsMetricsProvider, IArtifactsPurgedEventListener, IRelationModifiedEventListener, IFrameworkTransactionEventListener, IBranchEventListener, IXTaskViewer {
public static final String EDITOR_ID = "org.eclipse.osee.ats.editor.SMAEditor";
private StateMachineArtifact sma;
private int workFlowPageIndex, metricsPageIndex, attributesPageIndex;
@@ -155,6 +153,8 @@ public class SMAEditor extends AbstractArtifactEditor implements IArtifactListen sma.setEditor(this);
OseeEventManager.addListener(this);
+ registerForEvents();
+
updatePartName();
setContentDescription(priviledgedEditModeEnabled ? " PRIVILEGED EDIT MODE ENABLED" : "");
@@ -181,7 +181,6 @@ public class SMAEditor extends AbstractArtifactEditor implements IArtifactListen }
enableGlobalPrint();
- registerForEvents();
}
private ArtifactTypeEventFilter artifactTypeEventFilter;
private FilteredEventListener filteredEventListener;
@@ -792,58 +791,55 @@ public class SMAEditor extends AbstractArtifactEditor implements IArtifactListen }
@Override
- public void handleArtifactModified(Collection<EventBasicGuidArtifact> eventArtifacts, Collection<EventBasicGuidRelation> eventRelations, Sender sender) {
- System.out.println("SMAEditor: handleArtifactModified called " + sender);
- if (RemoteEventManager2.getInstance().isConnected()) {
- if (sma.isInTransition()) {
- return;
- }
- if (FrameworkEventUtil.isDeletedPurged(sma, eventArtifacts)) {
- Displays.ensureInDisplayThread(new Runnable() {
- @Override
- public void run() {
- closeEditor();
- }
- });
- } else if (FrameworkEventUtil.isModified(sma, eventArtifacts)) {
- Displays.ensureInDisplayThread(new Runnable() {
- @Override
- public void run() {
- try {
- refreshPages();
- onDirtied();
- } catch (Exception ex) {
- // do nothing
- }
- }
- });
- } else if (sma.isTeamWorkflow() && ReviewManager.hasReviews((TeamWorkFlowArtifact) sma)) {
- try {
- // If related review has made a change, redraw
- for (ReviewSMArtifact reviewArt : ReviewManager.getReviews((TeamWorkFlowArtifact) sma)) {
- // TODO addt his back in when relation events propogated
- // if (transData.isHasEvent(reviewArt)) {
- // Displays.ensureInDisplayThread(new Runnable() {
- // @Override
- // public void run() {
- // try {
- // refreshPages();
- // onDirtied();
- // } catch (Exception ex) {
- // // do nothing
- // }
- // }
- // });
- // // Only refresh editor for first review that has event
- // break;
- // }
+ public void handleArtifactEvent(ArtifactEvent artifactEvent, Sender sender) {
+ System.out.println("SMAEditor: handleArtifactModified called [" + artifactEvent + "] - sender " + sender + "");
+ if (sma.isInTransition()) {
+ return;
+ }
+ if (FrameworkEventUtil.isDeletedPurged(sma, artifactEvent.getArtifacts())) {
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ closeEditor();
+ }
+ });
+ } else if (FrameworkEventUtil.isModified(sma, artifactEvent.getArtifacts())) {
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ refreshPages();
+ onDirtied();
+ } catch (Exception ex) {
+ // do nothing
}
- } catch (Exception ex) {
- // do nothings
}
+ });
+ } else if (sma.isTeamWorkflow() && ReviewManager.hasReviews((TeamWorkFlowArtifact) sma)) {
+ try {
+ // If related review has made a change, redraw
+ for (ReviewSMArtifact reviewArt : ReviewManager.getReviews((TeamWorkFlowArtifact) sma)) {
+ // TODO addt his back in when relation events propogated
+ // if (transData.isHasEvent(reviewArt)) {
+ // Displays.ensureInDisplayThread(new Runnable() {
+ // @Override
+ // public void run() {
+ // try {
+ // refreshPages();
+ // onDirtied();
+ // } catch (Exception ex) {
+ // // do nothing
+ // }
+ // }
+ // });
+ // // Only refresh editor for first review that has event
+ // break;
+ // }
+ }
+ } catch (Exception ex) {
+ // do nothings
}
- onDirtied();
-
}
+ onDirtied();
}
}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java index d92b71736dd..6ca3f1510d6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java @@ -279,4 +279,8 @@ public class XWorkingBranch extends XWidget implements IArtifactWidget, IFramewo return deleteBranchButton;
}
+ public String toString() {
+ return String.format("%s", getLabel());
+ }
+
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java index 14ccb7f9d76..84fb45f2615 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java @@ -405,4 +405,8 @@ public class XCommitManager extends XWidget implements IArtifactWidget, IMergeBr return labelWidget;
}
+ public String toString() {
+ return String.format("%s", getLabel());
+ }
+
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java index 12452289ec8..c1f1a12e576 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java @@ -225,9 +225,11 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IArt @Override
protected void createSupportWidgets(Composite parent) {
+ final WorldXViewer fWorldXViewer = this;
super.createSupportWidgets(parent);
parent.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
+ OseeEventManager.removeListener(fWorldXViewer);
((WorldContentProvider) getContentProvider()).clear(false);
}
});
@@ -753,7 +755,6 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IArt */
@Override
public void dispose() {
- OseeEventManager.removeListener(this);
// Dispose of the table objects is done through separate dispose listener off tree
// Tell the label provider to release its resources
getLabelProvider().dispose();
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java index 4c023548a26..41758027ae9 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java @@ -6,7 +6,6 @@ package org.eclipse.osee.coverage.event;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
@@ -22,11 +21,11 @@ import org.eclipse.osee.framework.messaging.OseeMessagingListener; import org.eclipse.osee.framework.messaging.OseeMessagingStatusCallback;
import org.eclipse.osee.framework.messaging.ReplyConnection;
import org.eclipse.osee.framework.skynet.core.event.Sender;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventManager;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRelation;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactListener;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactEventListener;
import org.eclipse.osee.framework.skynet.core.event2.filter.ArtifactTypeEventFilter;
import org.eclipse.osee.framework.skynet.core.event2.filter.FilteredEventListener;
import org.eclipse.ui.PlatformUI;
@@ -34,7 +33,7 @@ import org.eclipse.ui.PlatformUI; /**
* @author Donald G. Dunne
*/
-public class CoverageEventManager implements IArtifactListener, OseeMessagingStatusCallback {
+public class CoverageEventManager implements IArtifactEventListener, OseeMessagingStatusCallback {
private static CoverageEventManager instance;
private List<CoverageEditor> editors = new ArrayList<CoverageEditor>();
@@ -129,10 +128,10 @@ public class CoverageEventManager implements IArtifactListener, OseeMessagingSta }
@Override
- public void handleArtifactModified(Collection<EventBasicGuidArtifact> eventArtifacts, Collection<EventBasicGuidRelation> eventRelations, Sender sender) {
+ public void handleArtifactEvent(ArtifactEvent artifactEvent, Sender sender) {
for (CoverageEditor editor : editors) {
try {
- for (EventBasicGuidArtifact eventArt : eventArtifacts) {
+ for (EventBasicGuidArtifact eventArt : artifactEvent.getArtifacts()) {
if (editor.getCoverageEditorInput().getCoveragePackageArtifact() == null) return;
if (editor.getCoverageEditorInput().getCoveragePackageArtifact().getBranch().getGuid() != eventArt.getBranchGuid()) return;
if (eventArt.getModType() == EventModType.Deleted || eventArt.getModType() == EventModType.ChangeType || eventArt.getModType() == EventModType.Purged) {
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/OseeProperties.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/OseeProperties.java index 92ccae3e197..c412c7a1b10 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/OseeProperties.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/OseeProperties.java @@ -128,14 +128,6 @@ public class OseeProperties { System.setProperty("osee.isInTest", String.valueOf(isInTest));
}
- public static boolean isNewEvents() {
- return Boolean.valueOf(System.getProperty("osee.isNewEvents"));
- }
-
- public static void setNewEvents(boolean enabled) {
- System.setProperty("osee.isNewEvents", String.valueOf(enabled));
- }
-
private void toStringHelper(List<String> list, Class<?> clazz) {
Field[] fields = clazz.getDeclaredFields();
for (Field field : fields) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerTest.java index f4e82d3e4b3..846c4ba6dc2 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerTest.java @@ -12,7 +12,6 @@ package org.eclipse.osee.framework.skynet.core.test.event; import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -22,7 +21,6 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.messaging.event.res.AttributeEventModificationType;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteAttributeChange1;
@@ -37,9 +35,11 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.ChangeArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.RemoteEventManager2;
import org.eclipse.osee.framework.skynet.core.event.Sender;
import org.eclipse.osee.framework.skynet.core.event.msgs.AttributeChange;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventManager;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventUtil;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
@@ -47,7 +47,7 @@ import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRela import org.eclipse.osee.framework.skynet.core.event2.artifact.EventChangeTypeBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModifiedBasicGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactListener;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactEventListener;
import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.skynet.core.utility.IncrementingNum;
@@ -62,22 +62,22 @@ public class ArtifactEventManagerTest { final Set<EventBasicGuidRelation> resultEventRelations = new HashSet<EventBasicGuidRelation>();
public static Sender resultSender = null;
public static List<String> ignoreLoggingRemote =
- Arrays.asList("OEM: PersistEvent Loopback enabled", "OEM: kickArtifactReloadEvent Loopback enabled",
- "OEM2: PersistEvent Loopback enabled", "OEM2: kickArtifactReloadEvent Loopback enabled");
+ Arrays.asList("OEM: ArtifactEvent Loopback enabled", "OEM: kickArtifactReloadEvent Loopback enabled",
+ "OEM2: ArtifactEvent Loopback enabled", "OEM2: kickArtifactReloadEvent Loopback enabled");
public static int incrementingGammaId = 2231;
- public class ArtifactEventListener implements IArtifactListener {
+ public class ArtifactEventListener implements IArtifactEventListener {
@Override
- public void handleArtifactModified(Collection<EventBasicGuidArtifact> eventArtifacts, Collection<EventBasicGuidRelation> eventRelations, Sender sender) {
- resultEventArtifacts.addAll(eventArtifacts);
- resultEventRelations.addAll(eventRelations);
+ public void handleArtifactEvent(ArtifactEvent artifactEvent, Sender sender) {
+ resultEventArtifacts.addAll(artifactEvent.getArtifacts());
+ resultEventRelations.addAll(artifactEvent.getRelations());
resultSender = sender;
}
}
@org.junit.Before
public void setUpTest() {
- OseeProperties.setNewEvents(true);
+ OseeEventManager.setNewEvents(true);
}
// artifact listener create for use by all tests to just capture result eventArtifacts for query
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventManagerTest.java index f926cddc3a7..d59b5d2b22d 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventManagerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventManagerTest.java @@ -24,7 +24,6 @@ import org.eclipse.osee.framework.core.exception.BranchDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -32,6 +31,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal;
import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.Sender;
import org.eclipse.osee.framework.skynet.core.event2.BranchEvent;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventManager;
@@ -325,7 +325,7 @@ public class BranchEventManagerTest { @org.junit.Before
public void setUpTest() {
- OseeProperties.setNewEvents(true);
+ OseeEventManager.setNewEvents(true);
}
@org.junit.BeforeClass
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/TransactionEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/TransactionEventTest.java index 5946e4950f9..3b21c740813 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/TransactionEventTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/TransactionEventTest.java @@ -18,12 +18,12 @@ import org.eclipse.osee.framework.core.data.DefaultBasicGuidArtifact; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.PurgeTransactionOperation;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.Sender;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventManager;
import org.eclipse.osee.framework.skynet.core.event2.ITransactionEventListener;
@@ -132,7 +132,7 @@ public class TransactionEventTest { @org.junit.Before
public void setUpTest() {
- OseeProperties.setNewEvents(true);
+ OseeEventManager.setNewEvents(true);
}
// artifact listener create for use by all tests to just capture result eventArtifacts for query
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java index 89cf2d9c682..0d6818b2170 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java @@ -51,10 +51,10 @@ import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.Sender;
import org.eclipse.osee.framework.skynet.core.event2.AccessControlEvent;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRelation;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactListener;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactEventListener;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
import org.eclipse.osee.framework.skynet.core.utility.LoadedArtifacts;
@@ -65,7 +65,7 @@ import org.eclipse.osee.framework.skynet.core.utility.LoadedArtifacts; * @author Jeff C. Phillips
*/
-public class AccessControlManager implements IBranchEventListener, IArtifactsPurgedEventListener, IArtifactListener {
+public class AccessControlManager implements IBranchEventListener, IArtifactsPurgedEventListener, IArtifactEventListener {
private static final String INSERT_INTO_ARTIFACT_ACL =
"INSERT INTO OSEE_ARTIFACT_ACL (art_id, permission_id, privilege_entity_id, branch_id) VALUES (?, ?, ?, ?)";
private static final String INSERT_INTO_BRANCH_ACL =
@@ -681,8 +681,8 @@ public class AccessControlManager implements IBranchEventListener, IArtifactsPur }
@Override
- public void handleArtifactModified(Collection<EventBasicGuidArtifact> eventArtifacts, Collection<EventBasicGuidRelation> eventRelations, Sender sender) {
- for (EventBasicGuidArtifact guidArt : eventArtifacts) {
+ public void handleArtifactEvent(ArtifactEvent artifactEvent, Sender sender) {
+ for (EventBasicGuidArtifact guidArt : artifactEvent.getArtifacts()) {
if (guidArt.is(EventModType.Added) && guidArt.is(CoreArtifactTypes.User)) {
reload();
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java index 1f3b1b3f3a4..7c467adda92 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.database.core.OseeSql; import org.eclipse.osee.framework.skynet.core.event.ArtifactModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event2.PersistEvent;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
import org.eclipse.osee.framework.skynet.core.transaction.BaseTransactionData;
@@ -74,7 +74,7 @@ public class ArtifactTransactionData extends BaseTransactionData { }
@Override
- protected void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, PersistEvent persistEvent) throws OseeCoreException {
+ protected void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, ArtifactEvent artifactEvent) throws OseeCoreException {
ArtifactModType artifactModType;
switch (getModificationType()) {
case MODIFIED:
@@ -83,12 +83,12 @@ public class ArtifactTransactionData extends BaseTransactionData { break;
case DELETED:
artifactModType = ArtifactModType.Deleted;
- persistEvent.getArtifacts().add(
+ artifactEvent.getArtifacts().add(
new EventBasicGuidArtifact(EventModType.Deleted, artifact.getBasicGuidArtifact()));
break;
default:
artifactModType = ArtifactModType.Added;
- persistEvent.getArtifacts().add(
+ artifactEvent.getArtifacts().add(
new EventBasicGuidArtifact(EventModType.Added, artifact.getBasicGuidArtifact()));
break;
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java index 845301caf1b..09691086100 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java @@ -28,7 +28,7 @@ import org.eclipse.osee.framework.core.model.AttributeType; import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event2.PersistEvent;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventChangeTypeBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
@@ -77,12 +77,12 @@ public class ChangeArtifactType { artifactType.getGuid(), new LoadedArtifacts(artifactsUserAccepted), artifactChanges);
// New Events
- PersistEvent persistEvent = new PersistEvent();
- persistEvent.setBranchGuid(artifactChanges.iterator().next().getBranchGuid());
+ ArtifactEvent artifactEvent = new ArtifactEvent();
+ artifactEvent.setBranchGuid(artifactChanges.iterator().next().getBranchGuid());
for (EventBasicGuidArtifact guidArt : artifactChanges) {
- persistEvent.getArtifacts().add(guidArt);
+ artifactEvent.getArtifacts().add(guidArt);
}
- OseeEventManager.kickPersistEvent(ChangeArtifactType.class, null, persistEvent);
+ OseeEventManager.kickPersistEvent(ChangeArtifactType.class, null, artifactEvent);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java index fa90ca8d593..c32e563547a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java @@ -29,7 +29,7 @@ import org.eclipse.osee.framework.database.core.SQL3DataType; import org.eclipse.osee.framework.jdk.core.util.time.GlobalTime;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event2.PersistEvent;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
@@ -173,12 +173,12 @@ public class PurgeArtifacts extends DbTransaction { artifactChanges);
// New Events
- PersistEvent persistEvent = new PersistEvent();
- persistEvent.setBranchGuid(artifactChanges.iterator().next().getBranchGuid());
+ ArtifactEvent artifactEvent = new ArtifactEvent();
+ artifactEvent.setBranchGuid(artifactChanges.iterator().next().getBranchGuid());
for (EventBasicGuidArtifact guidArt : artifactChanges) {
- persistEvent.getArtifacts().add(guidArt);
+ artifactEvent.getArtifacts().add(guidArt);
}
- OseeEventManager.kickPersistEvent(PurgeArtifacts.class, null, persistEvent);
+ OseeEventManager.kickPersistEvent(PurgeArtifacts.class, null, artifactEvent);
} finally {
ArtifactLoader.clearQuery(connection, queryId);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java index 7576ad04273..bb0482df022 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java @@ -24,7 +24,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache; import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.skynet.core.attribute.utils.AttributeURL;
import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;
-import org.eclipse.osee.framework.skynet.core.event2.PersistEvent;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.transaction.BaseTransactionData;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -138,6 +138,6 @@ public class AttributeTransactionData extends BaseTransactionData { }
@Override
- protected void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, PersistEvent persistEvent) throws OseeCoreException {
+ protected void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, ArtifactEvent artifactEvent) throws OseeCoreException {
}
}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java index cb0edd0ce39..8356b105598 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java @@ -390,7 +390,7 @@ public class InternalEventManager { execute(runnable);
}
- // Kick LOCAL and REMOTE PersistEvent
+ // Kick LOCAL and REMOTE ArtifactEvent
static void kickPersistEvent(final Sender sender, Collection<ArtifactTransactionModifiedEvent> xModifiedEvents) {
if (isDisableEvents()) {
return;
@@ -409,7 +409,7 @@ public class InternalEventManager { OseeLog.log(
InternalEventManager.class,
Level.WARNING,
- "IEM1: PersistEvent Loopback enabled" + (sender.isLocal() ? " - Ignoring Local Kick" : " - Kicking Local from Loopback"));
+ "IEM1: ArtifactEvent Loopback enabled" + (sender.isLocal() ? " - Ignoring Local Kick" : " - Kicking Local from Loopback"));
}
// Kick LOCAL
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager2.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager2.java index 7355d19dcf4..2783f13d94a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager2.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager2.java @@ -10,7 +10,6 @@ import java.util.Arrays; import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -20,13 +19,12 @@ import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredExcep import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.event2.AccessControlEvent;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.BranchEvent;
import org.eclipse.osee.framework.skynet.core.event2.BroadcastEvent;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventManager;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventUtil;
-import org.eclipse.osee.framework.skynet.core.event2.PersistEvent;
import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.ui.plugin.event.UnloadedArtifact;
@@ -114,11 +112,11 @@ public class InternalEventManager2 { }
// Kick LOCAL ArtifactReloadEvent
- static void kickLocalArtifactReloadEvent(final Sender sender, final Set<EventBasicGuidArtifact> artifactChanges) {
+ static void kickLocalArtifactReloadEvent(final Sender sender, final ArtifactEvent artifactEvent) {
if (isDisableEvents()) {
return;
}
- OseeEventManager.eventLog("IEM2: kickArtifactReloadEvent #Reloads: " + artifactChanges.size() + " - " + sender);
+ OseeEventManager.eventLog("IEM2: kickArtifactReloadEvent [" + artifactEvent + "] - " + sender);
Runnable runnable = new Runnable() {
public void run() {
try {
@@ -126,7 +124,7 @@ public class InternalEventManager2 { boolean normalOperation = !enableRemoteEventLoopback;
boolean loopbackTestEnabledAndRemoteEventReturned = enableRemoteEventLoopback && sender.isRemote();
if ((normalOperation && sender.isLocal()) || loopbackTestEnabledAndRemoteEventReturned) {
- FrameworkEventManager.processEventArtifactsAndRelations(sender, artifactChanges);
+ FrameworkEventManager.processEventArtifactsAndRelations(sender, artifactEvent);
}
// NO REMOTE KICK
@@ -178,35 +176,35 @@ public class InternalEventManager2 { execute(runnable);
}
- // Kick LOCAL and REMOTE PersistEvent
- static void kickPersistEvent(final Sender sender, final PersistEvent transEvent) {
- if (transEvent.getNetworkSender() == null) {
+ // Kick LOCAL and REMOTE ArtifactEvent
+ static void kickPersistEvent(final Sender sender, final ArtifactEvent artifactEvent) {
+ if (artifactEvent.getNetworkSender() == null) {
OseeEventManager.eventLog("IEM2: kickPersistEvent <<ERROR>> networkSender can't be null.");
return;
}
if (isDisableEvents()) {
return;
}
- OseeEventManager.eventLog("IEM2:kickPersistEvent [" + transEvent + "] - " + sender);
+ OseeEventManager.eventLog("IEM2: kickPersistEvent [" + artifactEvent + "] - " + sender);
Runnable runnable = new Runnable() {
public void run() {
// Roll-up change information
try {
// Log if this is a loopback and what is happening
if (!enableRemoteEventLoopback) {
- OseeEventManager.eventLog("IEM2: PersistEvent Loopback enabled" + (sender.isLocal() ? " - Ignoring Local Kick" : " - Kicking Local from Loopback"));
+ OseeEventManager.eventLog("IEM2: ArtifactEvent Loopback enabled" + (sender.isLocal() ? " - Ignoring Local Kick" : " - Kicking Local from Loopback"));
}
// Kick LOCAL
boolean normalOperation = !enableRemoteEventLoopback;
boolean loopbackTestEnabledAndRemoteEventReturned = enableRemoteEventLoopback && sender.isRemote();
if (normalOperation || loopbackTestEnabledAndRemoteEventReturned) {
- FrameworkEventManager.processEventArtifactsAndRelations(sender, transEvent);
+ FrameworkEventManager.processEventArtifactsAndRelations(sender, artifactEvent);
}
// Kick REMOTE (If source was Local and this was not a default branch changed event
if (sender.isLocal()) {
- RemoteEventManager2.getInstance().kick(FrameworkEventUtil.getRemotePersistEvent(transEvent));
+ RemoteEventManager2.getInstance().kick(FrameworkEventUtil.getRemotePersistEvent(artifactEvent));
}
} catch (Exception ex) {
OseeEventManager.eventLog("IEM2 kickPersistEvent", ex);
@@ -216,7 +214,7 @@ public class InternalEventManager2 { execute(runnable);
}
- // Kick LOCAL and REMOTE PersistEvent
+ // Kick LOCAL and REMOTE ArtifactEvent
static void kickTransactionEvent(final Sender sender, final TransactionEvent transEvent) {
if (transEvent.getNetworkSender() == null) {
OseeEventManager.eventLog("IEM2: kickTransactionEvent <<ERROR>> networkSender can't be null.");
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java index a1d412ff2c7..88c6b23621f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java @@ -25,9 +25,9 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactModType;
import org.eclipse.osee.framework.skynet.core.event2.AccessControlEvent;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.BranchEvent;
import org.eclipse.osee.framework.skynet.core.event2.BroadcastEvent;
-import org.eclipse.osee.framework.skynet.core.event2.PersistEvent;
import org.eclipse.osee.framework.skynet.core.event2.TransactionChange;
import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.event2.TransactionEventType;
@@ -62,8 +62,10 @@ public class OseeEventManager { if (InternalEventManager.isDisableEvents()) {
return;
}
- InternalEventManager.kickRemoteEventManagerEvent(getSender(source), remoteEventServiceEventType);
- InternalEventManager2.kickLocalRemEvent(getSender(source), remoteEventServiceEventType);
+ if (OseeEventManager.isOldEvents()) InternalEventManager.kickRemoteEventManagerEvent(getSender(source),
+ remoteEventServiceEventType);
+ if (OseeEventManager.isNewEvents()) InternalEventManager2.kickLocalRemEvent(getSender(source),
+ remoteEventServiceEventType);
}
// Kick LOCAL and REMOTE broadcast event
@@ -71,10 +73,10 @@ public class OseeEventManager { if (isDisableEvents()) {
return;
}
- InternalEventManager.kickBroadcastEvent(getSender(source), broadcastEvent.getBroadcastEventType(),
- broadcastEvent.getUsers().toArray(new String[broadcastEvent.getUsers().size()]),
- broadcastEvent.getMessage());
- InternalEventManager2.kickBroadcastEvent(getSender(source), broadcastEvent);
+ if (OseeEventManager.isOldEvents()) InternalEventManager.kickBroadcastEvent(getSender(source),
+ broadcastEvent.getBroadcastEventType(), broadcastEvent.getUsers().toArray(
+ new String[broadcastEvent.getUsers().size()]), broadcastEvent.getMessage());
+ if (OseeEventManager.isNewEvents()) InternalEventManager2.kickBroadcastEvent(getSender(source), broadcastEvent);
}
//Kick LOCAL and REMOTE branch events
@@ -86,9 +88,10 @@ public class OseeEventManager { if (isDisableEvents()) {
return;
}
- InternalEventManager.kickBranchEvent(getSender(source), branchEvent.getEventType(), branchId);
+ if (OseeEventManager.isOldEvents()) InternalEventManager.kickBranchEvent(getSender(source),
+ branchEvent.getEventType(), branchId);
branchEvent.setNetworkSender(getSender(source).getNetworkSender2());
- InternalEventManager2.kickBranchEvent(getSender(source), branchEvent);
+ if (OseeEventManager.isNewEvents()) InternalEventManager2.kickBranchEvent(getSender(source), branchEvent);
}
// Kick LOCAL and REMOTE branch events
@@ -96,7 +99,8 @@ public class OseeEventManager { if (isDisableEvents()) {
return;
}
- InternalEventManager.kickMergeBranchEvent(getSender(source), branchEventType, branchId);
+ if (OseeEventManager.isOldEvents()) InternalEventManager.kickMergeBranchEvent(getSender(source), branchEventType,
+ branchId);
// Handled by kickMergeBranchEvent for new Events
}
@@ -106,8 +110,10 @@ public class OseeEventManager { return;
}
accessControlEvent.setNetworkSender(getSender(source).getNetworkSender2());
- InternalEventManager.kickAccessControlArtifactsEvent(getSender(source), accessControlEvent, loadedArtifacts);
- InternalEventManager2.kickAccessControlArtifactsEvent(getSender(source), accessControlEvent);
+ if (OseeEventManager.isOldEvents()) InternalEventManager.kickAccessControlArtifactsEvent(getSender(source),
+ accessControlEvent, loadedArtifacts);
+ if (OseeEventManager.isNewEvents()) InternalEventManager2.kickAccessControlArtifactsEvent(getSender(source),
+ accessControlEvent);
}
// Kick LOCAL artifact modified event; This event does NOT go external
@@ -115,7 +121,8 @@ public class OseeEventManager { if (isDisableEvents()) {
return;
}
- InternalEventManager.kickArtifactModifiedEvent(getSender(source), artifactModType, artifact);
+ if (OseeEventManager.isOldEvents()) InternalEventManager.kickArtifactModifiedEvent(getSender(source),
+ artifactModType, artifact);
}
// Kick LOCAL relation modified event; This event does NOT go external
@@ -123,7 +130,8 @@ public class OseeEventManager { if (isDisableEvents()) {
return;
}
- InternalEventManager.kickRelationModifiedEvent(getSender(source), relationEventType, link, branch, relationType);
+ if (OseeEventManager.isOldEvents()) InternalEventManager.kickRelationModifiedEvent(getSender(source),
+ relationEventType, link, branch, relationType);
}
// Kick LOCAL and REMOTE purged event depending on sender
@@ -131,7 +139,8 @@ public class OseeEventManager { if (isDisableEvents()) {
return;
}
- InternalEventManager.kickArtifactsPurgedEvent(getSender(source), loadedArtifacts);
+ if (OseeEventManager.isOldEvents()) InternalEventManager.kickArtifactsPurgedEvent(getSender(source),
+ loadedArtifacts);
// Handled by kickTransactionEvent for new Events
}
@@ -140,7 +149,8 @@ public class OseeEventManager { if (isDisableEvents()) {
return;
}
- InternalEventManager.kickArtifactsChangeTypeEvent(getSender(source), toArtifactTypeId, loadedArtifacts);
+ if (OseeEventManager.isOldEvents()) InternalEventManager.kickArtifactsChangeTypeEvent(getSender(source),
+ toArtifactTypeId, loadedArtifacts);
// Handled by kickTransactionEvent for new Events
}
@@ -158,23 +168,24 @@ public class OseeEventManager { for (Integer value : transactionIds) {
transIds[x++] = value.intValue();
}
- if (transactionEvent.getEventType() == TransactionEventType.Purged) {
+ if (transactionEvent.getEventType() == TransactionEventType.Purged && OseeEventManager.isOldEvents()) {
InternalEventManager.kickTransactionsPurgedEvent(getSender(source), transIds);
}
transactionEvent.setNetworkSender(getSender(source).getNetworkSender2());
- InternalEventManager2.kickTransactionEvent(getSender(source), transactionEvent);
+ if (OseeEventManager.isNewEvents()) InternalEventManager2.kickTransactionEvent(getSender(source),
+ transactionEvent);
}
// Kick LOCAL and REMOTE transaction event
- public static void kickPersistEvent(Object source, Collection<ArtifactTransactionModifiedEvent> xModifiedEvents, PersistEvent persistEvent) throws OseeAuthenticationRequiredException {
+ public static void kickPersistEvent(Object source, Collection<ArtifactTransactionModifiedEvent> xModifiedEvents, ArtifactEvent artifactEvent) throws OseeAuthenticationRequiredException {
if (isDisableEvents()) {
return;
}
- if (xModifiedEvents != null) {
+ if (xModifiedEvents != null && OseeEventManager.isOldEvents()) {
InternalEventManager.kickPersistEvent(getSender(source), xModifiedEvents);
}
- persistEvent.setNetworkSender(getSender(source).getNetworkSender2());
- InternalEventManager2.kickPersistEvent(getSender(source), persistEvent);
+ artifactEvent.setNetworkSender(getSender(source).getNetworkSender2());
+ if (OseeEventManager.isNewEvents()) InternalEventManager2.kickPersistEvent(getSender(source), artifactEvent);
}
// Kick LOCAL transaction event
@@ -182,9 +193,11 @@ public class OseeEventManager { if (isDisableEvents()) {
return;
}
- InternalEventManager.kickArtifactReloadEvent(getSender(source), artifacts);
- InternalEventManager2.kickLocalArtifactReloadEvent(getSender(source), EventBasicGuidArtifact.get(
- EventModType.Reloaded, artifacts));
+ if (OseeEventManager.isOldEvents()) InternalEventManager.kickArtifactReloadEvent(getSender(source), artifacts);
+ ArtifactEvent artifactEvent = new ArtifactEvent();
+ artifactEvent.getArtifacts().addAll(EventBasicGuidArtifact.get(EventModType.Reloaded, artifacts));
+ if (OseeEventManager.isNewEvents()) InternalEventManager2.kickLocalArtifactReloadEvent(getSender(source),
+ artifactEvent);
}
/**
@@ -192,15 +205,15 @@ public class OseeEventManager { * listeners are called.
*/
public static void addPriorityListener(IEventListener listener) {
- InternalEventManager.addPriorityListener(listener);
+ if (OseeEventManager.isOldEvents()) InternalEventManager.addPriorityListener(listener);
}
public static void addListener(IEventListener listener) {
- InternalEventManager.addListener(listener);
+ if (OseeEventManager.isOldEvents()) InternalEventManager.addListener(listener);
}
public static void removeListener(IEventListener listener) {
- InternalEventManager.removeListeners(listener);
+ if (OseeEventManager.isOldEvents()) InternalEventManager.removeListeners(listener);
}
public static boolean isDisableEvents() {
@@ -215,7 +228,9 @@ public class OseeEventManager { // Return report showing all listeners registered
public static String getListenerReport() {
- return InternalEventManager.getListenerReport();
+ if (OseeEventManager.isOldEvents()) return InternalEventManager.getListenerReport();
+ if (OseeEventManager.isNewEvents()) return InternalEventManager2.getListenerReport();
+ return "Neither event system is active";
}
// Registration for branch events; for test only
@@ -236,6 +251,26 @@ public class OseeEventManager { return System.getProperty("eventDebug").equals("log") || "TRUE".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.osee.framework.skynet.core/debug/Events"));
}
+ /**
+ * If old event kicks and listens should be used
+ */
+ public static boolean isOldEvents() {
+ if (!Strings.isValid(System.getProperty("eventSystem"))) return true;
+ return System.getProperty("eventSystem").equals("old");
+ }
+
+ /**
+ * If new event kicks and listens should be used
+ */
+ public static boolean isNewEvents() {
+ if (!Strings.isValid(System.getProperty("eventSystem"))) return false;
+ return System.getProperty("eventSystem").equals("new");
+ }
+
+ public static void setNewEvents(boolean enabled) {
+ System.setProperty("eventSystem", enabled ? "new" : "old");
+ }
+
public static void eventLog(String output) {
eventLog(output, null);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java index 947b34d0412..c1adad6847e 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java @@ -33,7 +33,6 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
import org.eclipse.osee.framework.jini.discovery.EclipseJiniClassloader;
import org.eclipse.osee.framework.jini.discovery.IServiceLookupListener;
import org.eclipse.osee.framework.jini.discovery.ServiceDataStore;
@@ -99,20 +98,20 @@ public class RemoteEventManager { private RemoteEventManager() {
super();
- if (OseeProperties.isNewEvents()) {
- OseeEventManager.eventLog("REM1 Disabled");
- internalSkynetEventManager = null;
- clientEventListener = null;
- } else {
+ if (OseeEventManager.isOldEvents()) {
OseeEventManager.eventLog("REM1 Enabled");
internalSkynetEventManager = new InternalSkynetEventManager();
clientEventListener = new EventListener();
checkJiniRegistration();
+ } else {
+ OseeEventManager.eventLog("REM1 Disabled");
+ internalSkynetEventManager = null;
+ clientEventListener = null;
}
}
private void checkJiniRegistration() {
- if (OseeProperties.isNewEvents()) return;
+ if (OseeEventManager.isOldEvents()) return;
if (clientEventListenerRemoteReference == null) {
try {
// We need to trigger authentication before attempting to get database information from client session manager.
@@ -143,7 +142,7 @@ public class RemoteEventManager { }
public static void deregisterFromRemoteEventManager() {
- if (OseeProperties.isNewEvents()) return;
+ if (OseeEventManager.isNewEvents()) return;
ServiceDataStore.getEclipseInstance(EclipseJiniClassloader.getInstance()).removeListener(getEventServiceManager());
getEventServiceManager().reset();
}
@@ -153,11 +152,11 @@ public class RemoteEventManager { }
public static boolean isConnected() {
- return !OseeProperties.isNewEvents() && getEventServiceManager().isValid();
+ return OseeEventManager.isOldEvents() && getEventServiceManager().isValid();
}
public static void kick(final ISkynetEvent... events) {
- if (isConnected()) {
+ if (OseeEventManager.isOldEvents() && isConnected()) {
Job job = new Job("Send Event") {
@Override
protected IStatus run(IProgressMonitor monitor) {
@@ -251,7 +250,7 @@ public class RemoteEventManager { }
private void disconnectService(Exception e) {
- if (OseeProperties.isNewEvents()) return;
+ if (OseeEventManager.isNewEvents()) return;
OseeLog.log(Activator.class, Level.WARNING, "Skynet Event Service connection lost\n" + e.toString(), e);
setEventService(null);
try {
@@ -262,7 +261,7 @@ public class RemoteEventManager { }
private void connectToService(ISkynetEventService service) {
- if (OseeProperties.isNewEvents()) return;
+ if (OseeEventManager.isNewEvents()) return;
try {
ISkynetEventListener clientListener = getClientEventListenerRemoteReference();
if (clientListener != null) {
@@ -280,7 +279,7 @@ public class RemoteEventManager { }
public void serviceAdded(ServiceItem serviceItem) {
- if (OseeProperties.isNewEvents()) return;
+ if (OseeEventManager.isNewEvents()) return;
if (serviceItem.service instanceof ISkynetEventService) {
ISkynetEventService service = (ISkynetEventService) serviceItem.service;
if (isValidService(service)) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager2.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager2.java index 341ed9e8fc8..8792b60ef47 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager2.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager2.java @@ -23,7 +23,6 @@ import org.eclipse.osee.framework.core.model.AttributeType; import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.RelationType;
import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
import org.eclipse.osee.framework.messaging.event.res.AttributeEventModificationType;
import org.eclipse.osee.framework.messaging.event.res.IFrameworkEventListener;
import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
@@ -39,9 +38,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.ChangeArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.PurgeTransactionOperation;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.event.msgs.AttributeChange;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.BranchEvent;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventUtil;
-import org.eclipse.osee.framework.skynet.core.event2.PersistEvent;
import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.event2.TransactionEventType;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
@@ -98,7 +97,7 @@ public class RemoteEventManager2 implements IFrameworkEventListener { if (remoteEvent instanceof RemotePersistEvent1) {
try {
RemotePersistEvent1 event1 = (RemotePersistEvent1) remoteEvent;
- PersistEvent transEvent = FrameworkEventUtil.getPersistEvent(event1);
+ ArtifactEvent transEvent = FrameworkEventUtil.getPersistEvent(event1);
updateArtifacts(sender, transEvent);
updateRelations(sender, transEvent);
InternalEventManager2.kickPersistEvent(sender, transEvent);
@@ -163,7 +162,7 @@ public class RemoteEventManager2 implements IFrameworkEventListener { /**
* Updates local cache
**/
- private static void updateArtifacts(Sender sender, PersistEvent transEvent) {
+ private static void updateArtifacts(Sender sender, ArtifactEvent transEvent) {
// Don't crash on any one artifact update problem (no update method throughs exceptions)
for (EventBasicGuidArtifact guidArt : transEvent.getArtifacts()) {
OseeEventManager.eventLog(String.format("REM2: updateArtifact -> [%s]", guidArt));
@@ -192,7 +191,7 @@ public class RemoteEventManager2 implements IFrameworkEventListener { }
}
- private static void updateRelations(Sender sender, PersistEvent transEvent) {
+ private static void updateRelations(Sender sender, ArtifactEvent transEvent) {
for (EventBasicGuidRelation guidArt : transEvent.getRelations()) {
// Don't crash on any one relation update problem
try {
@@ -340,7 +339,7 @@ public class RemoteEventManager2 implements IFrameworkEventListener { }
public void registerForRemoteEvents() throws OseeCoreException {
- if (OseeProperties.isNewEvents()) {
+ if (OseeEventManager.isNewEvents()) {
ResEventManager.getInstance().start(this);
OseeEventManager.kickLocalRemEvent(this, RemoteEventServiceEventType.Rem2_Connected);
OseeEventManager.eventLog("REM2: Enabled");
@@ -350,7 +349,7 @@ public class RemoteEventManager2 implements IFrameworkEventListener { }
public boolean isConnected() {
- return OseeProperties.isNewEvents() && ResEventManager.getInstance().isConnected();
+ return OseeEventManager.isNewEvents() && ResEventManager.getInstance().isConnected();
}
/**
@@ -361,7 +360,7 @@ public class RemoteEventManager2 implements IFrameworkEventListener { * ui. SessionId needs to be modified so this client doesn't think the events came from itself.
*/
public void kick(final RemoteEvent remoteEvent) {
- if (OseeProperties.isNewEvents() && isConnected()) {
+ if (OseeEventManager.isNewEvents() && isConnected()) {
OseeEventManager.eventLog(String.format("REM2: kick - [%s]", remoteEvent));
Job job =
new Job(String.format("[%s] - sending [%s]", getClass().getSimpleName(),
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/ArtifactEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/ArtifactEvent.java new file mode 100644 index 00000000000..6f51a5b658f --- /dev/null +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/ArtifactEvent.java @@ -0,0 +1,63 @@ +package org.eclipse.osee.framework.skynet.core.event2;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.osee.framework.skynet.core.event.msgs.NetworkSender;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRelation;
+
+public class ArtifactEvent extends FrameworkEvent {
+
+ private String branchGuid;
+ private int transactionId;
+ private List<EventBasicGuidArtifact> artifacts;
+ private List<EventBasicGuidRelation> relations;
+ private NetworkSender networkSender;
+
+ public String getBranchGuid() {
+ return branchGuid;
+ }
+
+ public void setBranchGuid(String value) {
+ this.branchGuid = value;
+ }
+
+ public int getTransactionId() {
+ return transactionId;
+ }
+
+ public void setTransactionId(int value) {
+ this.transactionId = value;
+ }
+
+ public List<EventBasicGuidArtifact> getArtifacts() {
+ if (artifacts == null) {
+ artifacts = new ArrayList<EventBasicGuidArtifact>();
+ }
+ return this.artifacts;
+ }
+
+ public List<EventBasicGuidRelation> getRelations() {
+ if (relations == null) {
+ relations = new ArrayList<EventBasicGuidRelation>();
+ }
+ return this.relations;
+ }
+
+ public NetworkSender getNetworkSender() {
+ return networkSender;
+ }
+
+ public void setNetworkSender(NetworkSender value) {
+ this.networkSender = value;
+ }
+
+ public String toString() {
+ try {
+ return String.format("ArtifactEvent: BG[%s] TrId[%d] ARTS[%s] RELS[%s] Sender[%s]", branchGuid, transactionId,
+ artifacts, relations, networkSender);
+ } catch (Exception ex) {
+ return String.format("ArtifactEvent exception: " + ex.getLocalizedMessage());
+ }
+ }
+}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventManager.java index bad30dffc54..8c4f9e514d2 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventManager.java @@ -17,9 +17,8 @@ import org.eclipse.osee.framework.skynet.core.event.IRemoteEventManagerEventList import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.RemoteEventServiceEventType;
import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRelation;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactListener;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactEventListener;
import org.eclipse.osee.framework.skynet.core.event2.filter.FilteredEventListener;
import org.eclipse.osee.framework.skynet.core.event2.filter.IEventFilter;
@@ -37,6 +36,7 @@ public class FrameworkEventManager { }
if (!listeners.contains(listener)) {
listeners.add(listener);
+ OseeEventManager.eventLog("FEM: addListener (" + priorityListeners.size() + ") " + listener);
}
}
@@ -51,7 +51,7 @@ public class FrameworkEventManager { if (!priorityListeners.contains(listener)) {
priorityListeners.add(listener);
}
- OseeEventManager.eventLog("IEM1: addPriorityListener (" + priorityListeners.size() + ") " + listener);
+ OseeEventManager.eventLog("FEM: addPriorityListener (" + priorityListeners.size() + ") " + listener);
}
public static void removeListener(IEventListener listener) {
@@ -69,7 +69,7 @@ public class FrameworkEventManager { }
public static boolean isHandledBy(IEventListener event) {
- return event instanceof IArtifactListener || (event instanceof FilteredEventListener && ((FilteredEventListener) event).isOfType(IArtifactListener.class));
+ return event instanceof IArtifactEventListener || (event instanceof FilteredEventListener && ((FilteredEventListener) event).isOfType(IArtifactEventListener.class));
}
public static void processBranchEvent(Sender sender, BranchEvent branchEvent) {
@@ -98,38 +98,29 @@ public class FrameworkEventManager { }
}
- public static void processEventArtifactsAndRelations(Sender sender, PersistEvent transEvent) {
- processEventArtifactsAndRelations(sender, transEvent.getArtifacts(), transEvent.getRelations());
- }
-
- public static void processEventArtifactsAndRelations(Sender sender, Collection<EventBasicGuidArtifact> eventArtifacts) {
- processEventArtifactsAndRelations(sender, eventArtifacts, EMPTY_EVENT_RELATIONS);
- }
-
- public static void processEventArtifactsAndRelations(Sender sender, Collection<EventBasicGuidArtifact> eventArtifacts, Collection<EventBasicGuidRelation> eventRelations) {
- OseeEventManager.eventLog(String.format("FEM: processArtsAndRels arts[%s] rels[%s]", eventArtifacts,
- eventRelations));
+ public static void processEventArtifactsAndRelations(Sender sender, ArtifactEvent artifactEvent) {
+ OseeEventManager.eventLog(String.format("FEM: processArtsAndRels [%s]", artifactEvent));
for (IEventListener listener : priorityListeners) {
- processEventArtifactsAndRelationsListener(listener, sender, eventArtifacts, eventRelations);
+ processEventArtifactsAndRelationsListener(listener, artifactEvent, sender);
}
for (IEventListener listener : listeners) {
- processEventArtifactsAndRelationsListener(listener, sender, eventArtifacts, eventRelations);
+ processEventArtifactsAndRelationsListener(listener, artifactEvent, sender);
}
}
- private static void processEventArtifactsAndRelationsListener(IEventListener listener, Sender sender, Collection<EventBasicGuidArtifact> eventArtifacts, Collection<EventBasicGuidRelation> eventRelations) {
- IArtifactListener artifactListener = null;
+ private static void processEventArtifactsAndRelationsListener(IEventListener listener, ArtifactEvent artifactEvent, Sender sender) {
+ IArtifactEventListener artifactEventListener = null;
Collection<IEventFilter> eventFilters = null;
- if (listener instanceof IArtifactListener) {
- artifactListener = (IArtifactListener) listener;
+ if (listener instanceof IArtifactEventListener) {
+ artifactEventListener = (IArtifactEventListener) listener;
eventFilters = Collections.emptyList();
- } else if (listener instanceof FilteredEventListener && ((FilteredEventListener) listener).getEventListener() instanceof IArtifactListener) {
- artifactListener = (IArtifactListener) ((FilteredEventListener) listener).getEventListener();
+ } else if (listener instanceof FilteredEventListener && ((FilteredEventListener) listener).getEventListener() instanceof IArtifactEventListener) {
+ artifactEventListener = (IArtifactEventListener) ((FilteredEventListener) listener).getEventListener();
eventFilters = ((FilteredEventListener) listener).getEventFilters();
}
- if (artifactListener != null) {
+ if (artifactEventListener != null) {
// TODO handle filters first
- artifactListener.handleArtifactModified(eventArtifacts, eventRelations, sender);
+ artifactEventListener.handleArtifactEvent(artifactEvent, sender);
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventUtil.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventUtil.java index b128d0c7f86..2837c71710a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventUtil.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventUtil.java @@ -193,7 +193,7 @@ public class FrameworkEventUtil { return event;
}
- public static RemotePersistEvent1 getRemotePersistEvent(PersistEvent transEvent) {
+ public static RemotePersistEvent1 getRemotePersistEvent(ArtifactEvent transEvent) {
RemotePersistEvent1 event = new RemotePersistEvent1();
event.setNetworkSender(getRemoteNetworkSender(transEvent.getNetworkSender()));
event.setBranchGuid(transEvent.getBranchGuid());
@@ -221,8 +221,8 @@ public class FrameworkEventUtil { return event;
}
- public static PersistEvent getPersistEvent(RemotePersistEvent1 remEvent) {
- PersistEvent event = new PersistEvent();
+ public static ArtifactEvent getPersistEvent(RemotePersistEvent1 remEvent) {
+ ArtifactEvent event = new ArtifactEvent();
event.setNetworkSender(getNetworkSender(remEvent.getNetworkSender()));
event.setBranchGuid(remEvent.getBranchGuid());
event.setTransactionId(remEvent.getTransactionId());
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/PersistEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/PersistEvent.java deleted file mode 100644 index aedd0a4d231..00000000000 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/PersistEvent.java +++ /dev/null @@ -1,112 +0,0 @@ -package org.eclipse.osee.framework.skynet.core.event2;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.framework.core.data.DefaultBasicGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event.msgs.NetworkSender;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRelation;
-
-public class PersistEvent extends FrameworkEvent {
-
- private String branchGuid;
- private int transactionId;
- private List<EventBasicGuidArtifact> artifacts;
- private List<EventBasicGuidRelation> relations;
- private NetworkSender networkSender;
-
- /**
- * Gets the value of the branchGuid property.
- *
- * @return possible object is {@link String }
- */
- public String getBranchGuid() {
- return branchGuid;
- }
-
- /**
- * Sets the value of the branchGuid property.
- *
- * @param value allowed object is {@link String }
- */
- public void setBranchGuid(String value) {
- this.branchGuid = value;
- }
-
- /**
- * Gets the value of the transactionId property.
- */
- public int getTransactionId() {
- return transactionId;
- }
-
- /**
- * Sets the value of the transactionId property.
- */
- public void setTransactionId(int value) {
- this.transactionId = value;
- }
-
- /**
- * Gets the value of the artifacts property.
- * <p>
- * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to
- * the returned list will be present inside the JAXB object. This is why there is not a <CODE>set</CODE> method for
- * the artifacts property.
- * <p>
- * For example, to add a new item, do as follows:
- *
- * <pre>
- * getArtifacts().add(newItem);
- * </pre>
- * <p>
- * Objects of the following type(s) are allowed in the list {@link DefaultBasicGuidArtifact }
- */
- public List<EventBasicGuidArtifact> getArtifacts() {
- if (artifacts == null) {
- artifacts = new ArrayList<EventBasicGuidArtifact>();
- }
- return this.artifacts;
- }
-
- /**
- * Gets the value of the relations property.
- * <p>
- * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to
- * the returned list will be present inside the JAXB object. This is why there is not a <CODE>set</CODE> method for
- * the relations property.
- * <p>
- * For example, to add a new item, do as follows:
- *
- * <pre>
- * getRelations().add(newItem);
- * </pre>
- * <p>
- * Objects of the following type(s) are allowed in the list {@link EventBasicGuidRelation }
- */
- public List<EventBasicGuidRelation> getRelations() {
- if (relations == null) {
- relations = new ArrayList<EventBasicGuidRelation>();
- }
- return this.relations;
- }
-
- /**
- * Gets the value of the networkSender property.
- *
- * @return possible object is {@link NetworkSender }
- */
- public NetworkSender getNetworkSender() {
- return networkSender;
- }
-
- /**
- * Sets the value of the networkSender property.
- *
- * @param value allowed object is {@link NetworkSender }
- */
- public void setNetworkSender(NetworkSender value) {
- this.networkSender = value;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/IArtifactListener.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/IArtifactEventListener.java index d007d108adc..0543baadb42 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/IArtifactListener.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/IArtifactEventListener.java @@ -5,17 +5,17 @@ */
package org.eclipse.osee.framework.skynet.core.event2.artifact;
-import java.util.Collection;
import org.eclipse.osee.framework.skynet.core.event.IEventListener;
import org.eclipse.osee.framework.skynet.core.event.Sender;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
/**
* This listener will be called upon a artifact,relation,attribute change gets persisted to the database
*
* @author Donald G. Dunne
*/
-public interface IArtifactListener extends IEventListener {
+public interface IArtifactEventListener extends IEventListener {
- public void handleArtifactModified(Collection<EventBasicGuidArtifact> eventArtifacts, Collection<EventBasicGuidRelation> eventRelations, Sender sender);
+ public void handleArtifactEvent(ArtifactEvent artifactEvent, Sender sender);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/ClientDashboardRequestHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/ClientDashboardRequestHandler.java index bdd2d9ee65a..2a585385447 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/ClientDashboardRequestHandler.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/ClientDashboardRequestHandler.java @@ -32,6 +32,7 @@ import org.eclipse.osee.framework.logging.IHealthStatus; import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.OseeData;
import org.eclipse.osee.framework.skynet.core.UserManager;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.RemoteEventManager;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
@@ -89,7 +90,10 @@ public class ClientDashboardRequestHandler implements IHttpServerRequest { for (IHealthStatus status : OseeLog.getStatus()) {
sb.append("\n" + status.getSourceName() + ": [" + status.getMessage() + "]");
}
- sb.append("\nRemote Event Service: [" + RemoteEventManager.isConnected() + "]");
+ sb.append("\nRemote Event Service - Old Connected: [" + RemoteEventManager.isConnected() + "]");
+ sb.append("\nRemote Event Service - Old Active: [" + OseeEventManager.isOldEvents() + "]");
+ sb.append("\nRemote Event Service - New Connected: [" + RemoteEventManager.isConnected() + "]");
+ sb.append("\nRemote Event Service - New Active: [" + OseeEventManager.isNewEvents() + "]");
return sb.toString();
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java index 30360843250..1ea4ad71787 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.logging.Level; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.enums.OseeServiceTrackerId; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -24,9 +25,11 @@ import org.eclipse.osee.framework.core.services.IOseeModelFactoryService; import org.eclipse.osee.framework.core.services.IOseeModelFactoryServiceProvider; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.IOseeDatabaseServiceProvider; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.IWorkbenchUserService; import org.eclipse.osee.framework.skynet.core.WorkbenchUserService; import org.eclipse.osee.framework.skynet.core.attribute.HttpAttributeTagger; +import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; import org.eclipse.osee.framework.skynet.core.event.RemoteEventManager; import org.eclipse.osee.framework.skynet.core.event.RemoteEventManager2; import org.osgi.framework.Bundle; @@ -73,6 +76,9 @@ public class Activator implements BundleActivator, IOseeModelFactoryServiceProvi createServiceTracker(context, IOseeDatabaseService.class, OseeServiceTrackerId.OSEE_DATABASE_SERVICE); RemoteEventManager2.getInstance().registerForRemoteEvents(); + if (!OseeEventManager.isNewEvents() && !OseeEventManager.isOldEvents()) { + OseeLog.log(Activator.class, Level.SEVERE, "Neither Event System Enabled - This is a problem."); + } } @Override diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java index b1a6388419a..502cbfcce7c 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.RelationModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event2.PersistEvent;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRelation;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.transaction.BaseTransactionData;
@@ -85,7 +85,7 @@ public class RelationTransactionData extends BaseTransactionData { }
@Override
- protected void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, PersistEvent persistEvent) throws OseeCoreException {
+ protected void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, ArtifactEvent artifactEvent) throws OseeCoreException {
RelationEventType relationEventType =
getModificationType().isDeleted() ? RelationEventType.Deleted : RelationEventType.Added;
events.add(new RelationModifiedEvent(new Sender(this.getClass().getName()), relationEventType, relation,
@@ -95,7 +95,7 @@ public class RelationTransactionData extends BaseTransactionData { relation.getId(), relation.getGammaId(), relation.getArtifactA().getBasicGuidArtifact(),
relation.getArtifactB().getBasicGuidArtifact());
if (getModificationType() == ModificationType.ARTIFACT_DELETED || getModificationType() == ModificationType.DELETED) {
- persistEvent.getRelations().add(
+ artifactEvent.getRelations().add(
new EventBasicGuidRelation(RelationEventType.Deleted, relation.getAArtifactId(),
relation.getBArtifactId(), defaultBasicGuidRelation));
} else if (getModificationType() == ModificationType.MODIFIED) {
@@ -103,9 +103,9 @@ public class RelationTransactionData extends BaseTransactionData { new EventBasicGuidRelation(RelationEventType.ModifiedRationale, relation.getAArtifactId(),
relation.getBArtifactId(), defaultBasicGuidRelation);
event.setRationale(relation.getRationale());
- persistEvent.getRelations().add(event);
+ artifactEvent.getRelations().add(event);
} else if (getModificationType() == ModificationType.INTRODUCED || getModificationType() == ModificationType.NEW || getModificationType() == ModificationType.UNDELETED) {
- persistEvent.getRelations().add(
+ artifactEvent.getRelations().add(
new EventBasicGuidRelation(RelationEventType.Added, relation.getAArtifactId(),
relation.getBArtifactId(), defaultBasicGuidRelation));
} else {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java index 1fc50c15ca3..90204bca35f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.database.core.OseeSql; import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent; -import org.eclipse.osee.framework.skynet.core.event2.PersistEvent; +import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent; /** * @author Jeff C. Phillips @@ -119,7 +119,7 @@ public abstract class BaseTransactionData { /** * Should not be called by application. This should only be called once after the transaction has been committed. * - * @param persistEvent TODO + * @param artifactEvent TODO */ - protected abstract void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, PersistEvent persistEvent) throws OseeCoreException; + protected abstract void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, ArtifactEvent artifactEvent) throws OseeCoreException; } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java index e0ba540d633..4f0e0d68958 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java @@ -49,7 +49,7 @@ import org.eclipse.osee.framework.skynet.core.event.ArtifactModifiedEvent; import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event2.PersistEvent;
+import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModifiedBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
@@ -69,7 +69,7 @@ public class SkynetTransaction extends DbTransaction { private static final String GET_EXISTING_ATTRIBUTE_IDS =
"SELECT att1.attr_id FROM osee_attribute att1, osee_artifact art1, osee_txs txs1 WHERE att1.attr_type_id = ? AND att1.art_id = ? AND att1.art_id = art1.art_id AND art1.gamma_id = txs1.gamma_id AND txs1.branch_id <> ?";
- private TransactionRecord transactionId;
+ private TransactionRecord transactionId, lastTransactionId;
private final CompositeKeyHashMap<Class<? extends BaseTransactionData>, Integer, BaseTransactionData> transactionDataItems =
new CompositeKeyHashMap<Class<? extends BaseTransactionData>, Integer, BaseTransactionData>();
@@ -379,6 +379,7 @@ public class SkynetTransaction extends DbTransaction { @Override
protected void handleTxWork(OseeConnection connection) throws OseeCoreException {
+ lastTransactionId = internalGetTransactionRecord();
TransactionManager.internalPersist(connection, internalGetTransactionRecord());
executeTransactionDataItems(connection);
if (branch.getBranchState() == BranchState.CREATED) {
@@ -401,7 +402,8 @@ public class SkynetTransaction extends DbTransaction { private void updateModifiedCachedObject() throws OseeCoreException {
Collection<ArtifactTransactionModifiedEvent> xModifiedEvents = new ArrayList<ArtifactTransactionModifiedEvent>();
- PersistEvent persistEvent = new PersistEvent();
+ ArtifactEvent artifactEvent = new ArtifactEvent();
+ artifactEvent.setTransactionId(lastTransactionId.getId());
// Update all transaction items before collecting events
for (BaseTransactionData transactionData : transactionDataItems.values()) {
@@ -410,7 +412,7 @@ public class SkynetTransaction extends DbTransaction { // Collect events before clearing any dirty flags
for (BaseTransactionData transactionData : transactionDataItems.values()) {
- transactionData.internalAddToEvents(xModifiedEvents, persistEvent);
+ transactionData.internalAddToEvents(xModifiedEvents, artifactEvent);
}
for (Artifact artifact : artifactReferences) {
@@ -422,7 +424,10 @@ public class SkynetTransaction extends DbTransaction { new EventModifiedBasicGuidArtifact(artifact.getBranch().getGuid(),
artifact.getArtifactType().getGuid(), artifact.getGuid(),
artifact.getDirtyFrameworkAttributeChanges());
- persistEvent.getArtifacts().add(guidArt);
+ artifactEvent.getArtifacts().add(guidArt);
+ if (artifactEvent.getBranchGuid() == null) {
+ artifactEvent.setBranchGuid(artifact.getBranchGuid());
+ }
}
}
// Clear all dirty flags
@@ -431,7 +436,7 @@ public class SkynetTransaction extends DbTransaction { }
if (xModifiedEvents.size() > 0) {
- OseeEventManager.kickPersistEvent(this, xModifiedEvents, persistEvent);
+ OseeEventManager.kickPersistEvent(this, xModifiedEvents, artifactEvent);
xModifiedEvents.clear();
}
}
|