Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddunne2010-05-28 17:13:22 +0000
committerddunne2010-05-28 17:13:22 +0000
commit7763855ad12229cdd6e7dc61f2df1cdf621701c7 (patch)
tree5f91fe4fa80674a6b6a9c76ebf6bd851abb5bf91
parentf8557cce0633d4b2c9b6a87fe6aaff6c1f31e60c (diff)
downloadorg.eclipse.osee-7763855ad12229cdd6e7dc61f2df1cdf621701c7.tar.gz
org.eclipse.osee-7763855ad12229cdd6e7dc61f2df1cdf621701c7.tar.xz
org.eclipse.osee-7763855ad12229cdd6e7dc61f2df1cdf621701c7.zip
events
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranch.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java13
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/resMessages.xsd2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/ObjectFactory.java103
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java20
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java32
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/HttpAttributeTagger.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BranchEventListener.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BranchEventType.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IBranchEventListener.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IMergeBranchEventListener.java1
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java15
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/MergeBranchEventType.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java9
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventUtil.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractEventArtifactEditor.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java18
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java6
24 files changed, 55 insertions, 221 deletions
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 751890bac81..0aaa3932e25 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
@@ -673,10 +673,6 @@ public class SMAEditor extends AbstractArtifactEditor implements IArtifactListen
}
@Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
- }
-
- @Override
public void handleArtifactsPurgedEvent(Sender sender, LoadedArtifacts loadedArtifacts) {
try {
if (loadedArtifacts.getLoadedArtifacts().contains(sma)) {
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 e2e5503fc6d..d92b71736dd 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
@@ -259,10 +259,6 @@ public class XWorkingBranch extends XWidget implements IArtifactWidget, IFramewo
}
@Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) throws OseeCoreException {
- }
-
- @Override
public void handleFrameworkTransactionEvent(Sender sender, FrameworkTransactionData transData) throws OseeCoreException {
refreshOnBranchEvent();
}
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 46af84c7a9d..14ccb7f9d76 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
@@ -375,20 +375,21 @@ public class XCommitManager extends XWidget implements IArtifactWidget, IMergeBr
}
@Override
- public void handleBranchEvent(Sender sender, BranchEventType branchModType, int branchId) throws OseeCoreException {
+ public void handleBranchEvent(Sender sender, final BranchEventType branchModType, int branchId) throws OseeCoreException {
Displays.ensureInDisplayThread(new Runnable() {
@Override
public void run() {
- loadTable();
+ if (branchModType == BranchEventType.MergeConflictResolved) {
+ xCommitManager.refresh();
+ refresh();
+ } else {
+ loadTable();
+ }
}
});
}
@Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
- }
-
- @Override
public void handleMergeBranchEvent(Sender sender, MergeBranchEventType branchModType, int branchId) throws OseeCoreException {
Displays.ensureInDisplayThread(new Runnable() {
@Override
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/resMessages.xsd b/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/resMessages.xsd
index 80ba1037cf4..ca4d54c3a00 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/resMessages.xsd
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/resMessages.xsd
@@ -25,7 +25,7 @@
<xsd:complexType name="RemoteBranchEvent1">
<xsd:sequence>
- <xsd:element name="modTypeGuid" type="xsd:string"/>
+ <xsd:element name="eventTypeGuid" type="xsd:string"/>
<xsd:element name="branchGuid" type="xsd:string"/>
<xsd:element name="networkSender" type="RemoteNetworkSender1" maxOccurs="1" minOccurs="1"/>
</xsd:sequence>
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/ObjectFactory.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/ObjectFactory.java
deleted file mode 100644
index 693335cc6d2..00000000000
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/ObjectFactory.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2010.05.13 at 02:00:51 PM MST
-//
-
-
-package org.eclipse.osee.framework.messaging.event.res.msgs;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.eclipse.osee.framework.messaging.event.res.msgs package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
-@XmlRegistry
-public class ObjectFactory {
-
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.eclipse.osee.framework.messaging.event.res.msgs
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link RemoteTransactionEvent1 }
- *
- */
- public RemoteTransactionEvent1 createRemoteTransactionEvent1() {
- return new RemoteTransactionEvent1();
- }
-
- /**
- * Create an instance of {@link RemoteAttributeChange1 }
- *
- */
- public RemoteAttributeChange1 createRemoteAttributeChange1() {
- return new RemoteAttributeChange1();
- }
-
- /**
- * Create an instance of {@link RemoteTransactionDeletedEvent1 }
- *
- */
- public RemoteTransactionDeletedEvent1 createRemoteTransactionDeletedEvent1() {
- return new RemoteTransactionDeletedEvent1();
- }
-
- /**
- * Create an instance of {@link RemoteBranchEvent1 }
- *
- */
- public RemoteBranchEvent1 createRemoteBranchEvent1() {
- return new RemoteBranchEvent1();
- }
-
- /**
- * Create an instance of {@link RemoteBasicGuidArtifact1 }
- *
- */
- public RemoteBasicGuidArtifact1 createRemoteBasicGuidArtifact1() {
- return new RemoteBasicGuidArtifact1();
- }
-
- /**
- * Create an instance of {@link RemoteBroadcastEvent1 }
- *
- */
- public RemoteBroadcastEvent1 createRemoteBroadcastEvent1() {
- return new RemoteBroadcastEvent1();
- }
-
- /**
- * Create an instance of {@link RemoteBasicGuidRelation1 }
- *
- */
- public RemoteBasicGuidRelation1 createRemoteBasicGuidRelation1() {
- return new RemoteBasicGuidRelation1();
- }
-
- /**
- * Create an instance of {@link RemoteNetworkSender1 }
- *
- */
- public RemoteNetworkSender1 createRemoteNetworkSender1() {
- return new RemoteNetworkSender1();
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
index 882591627cd..55df3472453 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2010.05.13 at 02:00:51 PM MST
+// Generated on: 2010.05.28 at 09:30:30 AM MST
//
@@ -25,7 +25,7 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
- * &lt;element name="modTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * &lt;element name="eventTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="branchGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="networkSender" type="{}RemoteNetworkSender1"/>
* &lt;/sequence>
@@ -38,7 +38,7 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "RemoteBranchEvent1", propOrder = {
- "modTypeGuid",
+ "eventTypeGuid",
"branchGuid",
"networkSender"
})
@@ -47,34 +47,34 @@ public class RemoteBranchEvent1
{
@XmlElement(required = true)
- protected String modTypeGuid;
+ protected String eventTypeGuid;
@XmlElement(required = true)
protected String branchGuid;
@XmlElement(required = true)
protected RemoteNetworkSender1 networkSender;
/**
- * Gets the value of the modTypeGuid property.
+ * Gets the value of the eventTypeGuid property.
*
* @return
* possible object is
* {@link String }
*
*/
- public String getModTypeGuid() {
- return modTypeGuid;
+ public String getEventTypeGuid() {
+ return eventTypeGuid;
}
/**
- * Sets the value of the modTypeGuid property.
+ * Sets the value of the eventTypeGuid property.
*
* @param value
* allowed object is
* {@link String }
*
*/
- public void setModTypeGuid(String value) {
- this.modTypeGuid = value;
+ public void setEventTypeGuid(String value) {
+ this.eventTypeGuid = value;
}
/**
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 d0e16c1dac2..7ea16745091 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
@@ -15,14 +15,12 @@ import static org.eclipse.osee.framework.core.enums.PermissionEnum.DENY;
import static org.eclipse.osee.framework.core.enums.PermissionEnum.FULLACCESS;
import static org.eclipse.osee.framework.core.enums.PermissionEnum.LOCK;
import static org.eclipse.osee.framework.core.enums.PermissionEnum.READ;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
-
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
@@ -54,7 +52,7 @@ import org.eclipse.osee.framework.skynet.core.utility.LoadedArtifacts;
/**
* Provides access control for OSEE.
- *
+ *
* @author Jeff C. Phillips
*/
@@ -94,7 +92,7 @@ public class AccessControlManager implements IBranchEventListener, IArtifactsPur
private static final AccessControlManager instance = new AccessControlManager();
private AccessControlManager() {
- initializeCaches();
+ initializeCaches();
try {
populateAccessControlLists();
} catch (Exception ex) {
@@ -103,16 +101,16 @@ public class AccessControlManager implements IBranchEventListener, IArtifactsPur
OseeEventManager.addListener(this);
}
-
- private static void initializeCaches() {
- accessControlListCache = new DoubleKeyHashMap<Integer, AccessObject, PermissionEnum>();
- objectToSubjectCache = new HashCollection<AccessObject, Integer>();
- subjectToGroupCache = new HashCollection<Integer, Integer>();
- groupToSubjectsCache = new HashCollection<Integer, Integer>();
- objectToBranchLockCache = new HashMap<Integer, Integer>();
- lockedObjectToSubject = new HashMap<Integer, Integer>();
- subjectToPermissionCache = new HashCollection<Integer, PermissionEnum>();
- }
+
+ private static void initializeCaches() {
+ accessControlListCache = new DoubleKeyHashMap<Integer, AccessObject, PermissionEnum>();
+ objectToSubjectCache = new HashCollection<AccessObject, Integer>();
+ subjectToGroupCache = new HashCollection<Integer, Integer>();
+ groupToSubjectsCache = new HashCollection<Integer, Integer>();
+ objectToBranchLockCache = new HashMap<Integer, Integer>();
+ lockedObjectToSubject = new HashMap<Integer, Integer>();
+ subjectToPermissionCache = new HashCollection<Integer, PermissionEnum>();
+ }
private static void populateAccessControlLists() throws OseeCoreException {
populateArtifactAccessControlList();
@@ -370,7 +368,7 @@ public class AccessControlManager implements IBranchEventListener, IArtifactsPur
if (recurse) {
Artifact artifact =
ArtifactQuery.getArtifactFromId(artifactAccessObject.getArtId(),
- BranchManager.getBranch(artifactAccessObject.getId()));
+ BranchManager.getBranch(artifactAccessObject.getId()));
AccessControlData childAccessControlData = null;
for (Artifact child : artifact.getChildren()) {
@@ -625,10 +623,6 @@ public class AccessControlManager implements IBranchEventListener, IArtifactsPur
}
@Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
- }
-
- @Override
public void handleArtifactsPurgedEvent(Sender sender, LoadedArtifacts loadedArtifacts) throws OseeCoreException {
try {
for (Artifact artifact : loadedArtifacts.getLoadedArtifacts()) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/HttpAttributeTagger.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/HttpAttributeTagger.java
index 961673f943b..bf1eeb748f7 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/HttpAttributeTagger.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/HttpAttributeTagger.java
@@ -134,10 +134,6 @@ public class HttpAttributeTagger {
}
@Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
- }
-
- @Override
public void handleArtifactsPurgedEvent(Sender sender, LoadedArtifacts loadedArtifacts) {
// if (sender.isRemote()) {
// return;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BranchEventListener.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BranchEventListener.java
index ef71f59d348..bd550b2fe2e 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BranchEventListener.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BranchEventListener.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.event;
-
/**
* @author Donald G. Dunne
*/
@@ -20,8 +19,4 @@ public class BranchEventListener implements IBranchEventListener {
public void handleBranchEvent(Sender sender, BranchEventType branchModType, int branchId) {
}
- @Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
- }
-
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BranchEventType.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BranchEventType.java
index 1ebf72d715a..19397c3f80a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BranchEventType.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BranchEventType.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.event;
-
/**
* @author Donald G. Dunne
*/
@@ -24,7 +23,8 @@ public enum BranchEventType {
Committed(EventType.LocalAndRemote, "AAn_QHIu0mGZytQ11QwA"),
TypeUpdated(EventType.LocalAndRemote, "AAn_QHLW4DKKbUkEZggA"),
StateUpdated(EventType.LocalAndRemote, "AAn_QHQdKhxNLtWPchAA"),
- ArchiveStateUpdated(EventType.LocalAndRemote, "AAn_QHS7Zhr6OLhKl3gA");
+ ArchiveStateUpdated(EventType.LocalAndRemote, "AAn_QHS7Zhr6OLhKl3gA"),
+ MergeConflictResolved(EventType.LocalAndRemote, "AAn_QHiJ53W5W_k8W7AA");
private final EventType eventType;
private final String guid;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IBranchEventListener.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IBranchEventListener.java
index 7d9a2511d45..57dfaa265d7 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IBranchEventListener.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IBranchEventListener.java
@@ -18,6 +18,4 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
public interface IBranchEventListener extends IEventListener {
public void handleBranchEvent(Sender sender, BranchEventType branchModType, int branchId) throws OseeCoreException;
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) throws OseeCoreException;
-
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IMergeBranchEventListener.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IMergeBranchEventListener.java
index ac79dcbf920..c3799a4039e 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IMergeBranchEventListener.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IMergeBranchEventListener.java
@@ -15,6 +15,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
/**
* @author Donald G. Dunne
*/
+// TODO remove this when old branch events go away; handled by BranchEventType.MergeConflictResolved for new events
public interface IMergeBranchEventListener extends IEventListener {
public void handleMergeBranchEvent(Sender sender, MergeBranchEventType branchModType, int branchId) throws OseeCoreException;
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 a9b4fbe59e5..47c622d4fa8 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
@@ -283,21 +283,6 @@ public class InternalEventManager {
execute(runnable);
}
- /*
- * Kick LOCAL event to notify application that the branch to artifact cache has been updated;
- * This event does NOT go external
- */
- static void kickLocalBranchToArtifactCacheUpdateEvent(final Sender sender) throws OseeCoreException {
- OseeEventManager.eventLog("IEM1: kickLocalBranchToArtifactCacheUpdateEvent - " + sender);
- Runnable runnable = new Runnable() {
- public void run() {
- // Kick LOCAL
- safelyInvokeListeners(IBranchEventListener.class, "handleLocalBranchToArtifactCacheUpdateEvent", sender);
- }
- };
- execute(runnable);
- }
-
// Kick LOCAL artifact modified event; This event does NOT go external
static void kickArtifactModifiedEvent(final Sender sender, final ArtifactModType artifactModType, final Artifact artifact) throws OseeCoreException {
OseeEventManager.eventLog("IEM1: kickArtifactModifiedEvent - " + artifactModType + " - " + artifact.getGuid() + " - " + sender + " - " + artifact.getDirtySkynetAttributeChanges());
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/MergeBranchEventType.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/MergeBranchEventType.java
index 49b51dfe2bd..d7b6dd12f83 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/MergeBranchEventType.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/MergeBranchEventType.java
@@ -16,8 +16,9 @@ package org.eclipse.osee.framework.skynet.core.event;
public enum MergeBranchEventType {
// Local and Remote events
- ConflictResolved(EventType.LocalAndRemote),
- Update(EventType.LocalAndRemote);
+ // TODO This type can be deleted once move to new events is completed; handled through
+ // BranchEventType.MergeConflictResolved for new events
+ ConflictResolved(EventType.LocalAndRemote);
private final EventType eventType;
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 f139fbf8484..8fd33e93a77 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
@@ -92,6 +92,7 @@ public class OseeEventManager {
return;
}
InternalEventManager.kickMergeBranchEvent(getSender(source), branchEventType, branchId);
+ // Handled by kickMergeBranchEvent for new Events
}
// Kick LOCAL and REMOTE access control events
@@ -102,14 +103,6 @@ public class OseeEventManager {
InternalEventManager.kickAccessControlArtifactsEvent(getSender(source), accessControlModType, loadedArtifacts);
}
- // Kick local event to notify application that the branch to artifact cache has been updated
- public static void kickLocalBranchToArtifactCacheUpdateEvent(Object source) throws OseeCoreException {
- if (isDisableEvents()) {
- return;
- }
- InternalEventManager.kickLocalBranchToArtifactCacheUpdateEvent(getSender(source));
- }
-
// Kick LOCAL artifact modified event; This event does NOT go external
public static void kickArtifactModifiedEvent(Object source, ArtifactModType artifactModType, Artifact artifact) throws OseeCoreException {
if (isDisableEvents()) {
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 3f18a84f29e..bfa5121a876 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
@@ -107,14 +107,14 @@ public class FrameworkEventUtil {
public static RemoteBranchEvent1 getRemoteBranchEvent(BranchEvent branchEvent) {
RemoteBranchEvent1 event = new RemoteBranchEvent1();
- event.setModTypeGuid(branchEvent.getEventType().getGuid());
+ event.setEventTypeGuid(branchEvent.getEventType().getGuid());
event.setBranchGuid(branchEvent.getBranchGuid());
event.setNetworkSender(getRemoteNetworkSender(branchEvent.getNetworkSender()));
return event;
}
public static BranchEvent getBranchEvent(RemoteBranchEvent1 branchEvent) {
- BranchEventType branchEventType = BranchEventType.getByGuid(branchEvent.getModTypeGuid());
+ BranchEventType branchEventType = BranchEventType.getByGuid(branchEvent.getEventTypeGuid());
if (branchEventType != null) {
BranchEvent event = new BranchEvent(branchEventType, branchEvent.getBranchGuid());
event.setNetworkSender(getNetworkSender(branchEvent.getNetworkSender()));
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
index a562621cf8f..606096ec451 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
@@ -1432,10 +1432,6 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener,
}
@Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
- }
-
- @Override
public void handleAccessControlArtifactsEvent(Sender sender, AccessControlEventType accessControlEventType, LoadedArtifacts loadedArtifacts) {
try {
if (loadedArtifacts.isNotForBranch(branch)) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractEventArtifactEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractEventArtifactEditor.java
index 687f21555ae..056ee3db673 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractEventArtifactEditor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractEventArtifactEditor.java
@@ -183,10 +183,6 @@ public abstract class AbstractEventArtifactEditor extends AbstractArtifactEditor
}
@Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
- }
-
- @Override
public void handleAccessControlArtifactsEvent(Sender sender, AccessControlEventType accessControlEventType, LoadedArtifacts loadedArtifacts) {
try {
if (accessControlEventType == AccessControlEventType.ArtifactsLocked || accessControlEventType == AccessControlEventType.ArtifactsUnlocked) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java
index e72c38cd58e..45cba0b1536 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java
@@ -150,10 +150,6 @@ public class ChangeReportEditor extends FormEditor implements IChangeReportView
private final class EventRelay implements IBranchEventListener, ITransactionsDeletedEventListener {
@Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) throws OseeCoreException {
- }
-
- @Override
public void handleBranchEvent(Sender sender, BranchEventType branchModType, final int branchId) {
ChangeUiData changeUiData = getEditorInput().getChangeData();
Branch[] branches = new Branch[2];
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java
index ea4bc03eb83..943f9568310 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java
@@ -66,7 +66,4 @@ public class DefaultBranchContentProvider implements ITreeContentProvider, IBran
public void handleBranchEvent(Sender sender, BranchEventType branchModType, final int branchId) {
}
- @Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
- }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java
index 3fe008e96d9..f7bf525d65f 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java
@@ -45,7 +45,7 @@ import org.eclipse.ui.part.ViewPart;
/**
* Displays persisted changes made to an artifact.
- *
+ *
* @author Jeff C. Phillips
*/
public class BranchView extends ViewPart implements IActionable, IBranchEventListener, ITransactionsDeletedEventListener {
@@ -159,10 +159,6 @@ public class BranchView extends ViewPart implements IActionable, IBranchEventLis
}
@Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
- }
-
- @Override
public void handleTransactionsDeletedEvent(Sender sender, int[] transactionIds) {
Displays.ensureInDisplayThread(new Runnable() {
public void run() {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java
index bcd6e9b22ba..287d2d20562 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java
@@ -309,10 +309,6 @@ public class HistoryView extends ViewPart implements IActionable, IBranchEventLi
}
}
- @Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
- }
-
private void closeView() {
SkynetViews.closeView(VIEW_ID, getViewSite().getSecondaryId());
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
index 732a39f0ec5..c87fb703c4f 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
@@ -19,7 +19,6 @@ import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.IMenuListener;
@@ -270,11 +269,14 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList
private void createDiffMenuItem(MenuManager menuManager) {
MenuManager subMenuManager = new MenuManager("Differences", "diffTransaction");
menuManager.add(subMenuManager);
- createDiffItems(subMenuManager, new DiffHandler(menuManager, 1, mergeXWidget), "Show Source Branch Differences");
- createDiffItems(subMenuManager, new DiffHandler(menuManager, 2, mergeXWidget), "Show Destination Branch Differences");
- createDiffItems(subMenuManager, new DiffHandler(menuManager, 3, mergeXWidget), "Show Source/Destination Differences");
- createDiffItems(subMenuManager, new DiffHandler(menuManager, 4, mergeXWidget), "Show Source/Merge Differences");
- createDiffItems(subMenuManager, new DiffHandler(menuManager, 5, mergeXWidget), "Show Destination/Merge Differences");
+ createDiffItems(subMenuManager, new DiffHandler(menuManager, 1, mergeXWidget), "Show Source Branch Differences");
+ createDiffItems(subMenuManager, new DiffHandler(menuManager, 2, mergeXWidget),
+ "Show Destination Branch Differences");
+ createDiffItems(subMenuManager, new DiffHandler(menuManager, 3, mergeXWidget),
+ "Show Source/Destination Differences");
+ createDiffItems(subMenuManager, new DiffHandler(menuManager, 4, mergeXWidget), "Show Source/Merge Differences");
+ createDiffItems(subMenuManager, new DiffHandler(menuManager, 5, mergeXWidget),
+ "Show Destination/Merge Differences");
}
private String addDiffItems(MenuManager subMenuManager, String command) {
@@ -777,10 +779,6 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList
}
@Override
- public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
- }
-
- @Override
public void handleFrameworkTransactionEvent(final Sender sender, final FrameworkTransactionData transData) throws OseeCoreException {
try {
if (sourceBranch == null || destBranch == null) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java
index 852828514b1..1811ea5beea 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java
@@ -29,8 +29,10 @@ import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.HttpBranchCreation;
import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict;
import org.eclipse.osee.framework.skynet.core.conflict.Conflict;
+import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
import org.eclipse.osee.framework.skynet.core.event.MergeBranchEventType;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
+import org.eclipse.osee.framework.skynet.core.event2.BranchEvent;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.Displays;
import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
@@ -196,8 +198,12 @@ public class MergeXViewer extends XViewer {
MergeUtility.setToDest(conflict, shell, true);
} else if (isXViewerColumn(treeColumn, MergeXViewerFactory.Conflict_Resolved)) {
conflict.handleResolvedSelection();
+ // old events
OseeEventManager.kickMergeBranchEvent(HttpBranchCreation.class, MergeBranchEventType.ConflictResolved,
conflict.getMergeBranchID());
+ // new events
+ OseeEventManager.kickBranchEvent(HttpBranchCreation.class, new BranchEvent(
+ BranchEventType.MergeConflictResolved, conflict.getMergeBranch().getGuid()), conflict.getMergeBranchID());
} else if (isXViewerColumn(treeColumn, MergeXViewerFactory.Merged)) {
if (!conflict.getConflictType().equals(ConflictType.ARTIFACT)) {
AttributeConflict attributeConflict = (AttributeConflict) conflict;

Back to the top