summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngel Avila2012-09-17 17:11:25 (EDT)
committer Roberto E. Escobar2012-09-18 13:31:42 (EDT)
commita1de0e6a3f9a893c8c1ab95556e3beedf79cb5dd (patch)
tree024033d897c821af52b12e75dbd33d5a71b1a2d9
parentf84fff56050ac069e3e37c8c9fa90c35985aaa64 (diff)
downloadorg.eclipse.osee-a1de0e6a3f9a893c8c1ab95556e3beedf79cb5dd.zip
org.eclipse.osee-a1de0e6a3f9a893c8c1ab95556e3beedf79cb5dd.tar.gz
org.eclipse.osee-a1de0e6a3f9a893c8c1ab95556e3beedf79cb5dd.tar.bz2
bug[ats_B5MXJ]: Add event to update clients upon commit
Add destination branch to BranchEvent. Upon commit, determine changes to attributes and relations for all artifacts and kick an artifact event with changes to remote clients.
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/README.txt4
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/resMessages.xsd8
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/ObjectFactory.java108
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlEvent1.java5
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAttributeChange1.java4
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java291
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java432
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelationReorder1.java180
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java31
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBroadcastEvent1.java5
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteNetworkSender1.java344
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java5
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionChange1.java148
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionEvent1.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java16
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java23
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java29
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CommitBranchHttpRequestOperation.java118
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java11
21 files changed, 911 insertions, 862 deletions
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/README.txt b/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/README.txt
index 6984717..995efb8 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/README.txt
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/README.txt
@@ -1 +1,3 @@
-xjc resMessages.xsd -extension -d ../src-gen -p org.eclipse.osee.framework.messaging.event.res.msgs \ No newline at end of file
+Download jaxb from "http://jaxb.java.net/2.2.6/"
+cd C:\UserData\gitroot\dev\org.eclipse.osee\plugins\org.eclipse.osee.framework.messaging.event.res\jaxb
+/c/path/to/jaxb/bin/xjc.sh resMessages.xsd -extension -d ../src-gen -p org.eclipse.osee.framework.messaging.event.res.msgs \ No newline at end of file
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 d4279e1..0fc8afc 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
@@ -34,9 +34,11 @@
<xsd:complexType name="RemoteBranchEvent1">
<xsd:sequence>
- <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:element name="eventTypeGuid" type="xsd:string" />
+ <xsd:element name="branchGuid" type="xsd:string"></xsd:element>
+ <xsd:element name="destinationBranchGuid" type="xsd:string" maxOccurs="1" minOccurs="0"></xsd:element>
+ <xsd:element name="networkSender" type="RemoteNetworkSender1"
+ maxOccurs="1" minOccurs="1" />
</xsd:sequence>
</xsd:complexType>
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
new file mode 100644
index 0000000..9ccf297
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/ObjectFactory.java
@@ -0,0 +1,108 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.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: 2012.09.14 at 05:06:42 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 RemoteBasicGuidRelationReorder1 }
+ */
+ public RemoteBasicGuidRelationReorder1 createRemoteBasicGuidRelationReorder1() {
+ return new RemoteBasicGuidRelationReorder1();
+ }
+
+ /**
+ * Create an instance of {@link RemoteAttributeChange1 }
+ */
+ public RemoteAttributeChange1 createRemoteAttributeChange1() {
+ return new RemoteAttributeChange1();
+ }
+
+ /**
+ * Create an instance of {@link RemoteTransactionEvent1 }
+ */
+ public RemoteTransactionEvent1 createRemoteTransactionEvent1() {
+ return new RemoteTransactionEvent1();
+ }
+
+ /**
+ * Create an instance of {@link RemoteBroadcastEvent1 }
+ */
+ public RemoteBroadcastEvent1 createRemoteBroadcastEvent1() {
+ return new RemoteBroadcastEvent1();
+ }
+
+ /**
+ * Create an instance of {@link RemoteNetworkSender1 }
+ */
+ public RemoteNetworkSender1 createRemoteNetworkSender1() {
+ return new RemoteNetworkSender1();
+ }
+
+ /**
+ * 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 RemoteAccessControlEvent1 }
+ */
+ public RemoteAccessControlEvent1 createRemoteAccessControlEvent1() {
+ return new RemoteAccessControlEvent1();
+ }
+
+ /**
+ * Create an instance of {@link RemoteBasicGuidRelation1 }
+ */
+ public RemoteBasicGuidRelation1 createRemoteBasicGuidRelation1() {
+ return new RemoteBasicGuidRelation1();
+ }
+
+ /**
+ * Create an instance of {@link RemoteTransactionChange1 }
+ */
+ public RemoteTransactionChange1 createRemoteTransactionChange1() {
+ return new RemoteTransactionChange1();
+ }
+
+ /**
+ * Create an instance of {@link RemotePersistEvent1 }
+ */
+ public RemotePersistEvent1 createRemotePersistEvent1() {
+ return new RemotePersistEvent1();
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlEvent1.java
index 0b090e7..6884840 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlEvent1.java
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.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: 2011.08.22 at 10:40:57 AM MST
+// Generated on: 2012.09.14 at 05:06:42 PM MST
//
package org.eclipse.osee.framework.messaging.event.res.msgs;
@@ -91,7 +91,6 @@ public class RemoteAccessControlEvent1 extends RemoteEvent {
*
* @return possible object is {@link RemoteNetworkSender1 }
*/
- @Override
public RemoteNetworkSender1 getNetworkSender() {
return networkSender;
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAttributeChange1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAttributeChange1.java
index 6562b6d..033e860 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAttributeChange1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAttributeChange1.java
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.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: 2011.08.22 at 10:40:57 AM MST
+// Generated on: 2012.09.14 at 05:06:42 PM MST
//
package org.eclipse.osee.framework.messaging.event.res.msgs;
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java
index 50eb17a..ba0be72 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java
@@ -1,11 +1,10 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.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: 2011.08.22 at 10:40:57 AM MST
+// Generated on: 2012.09.14 at 05:06:42 PM MST
//
-
package org.eclipse.osee.framework.messaging.event.res.msgs;
import java.util.ArrayList;
@@ -16,11 +15,11 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
-
/**
- * <p>Java class for RemoteBasicGuidArtifact1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * Java class for RemoteBasicGuidArtifact1 complex type.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="RemoteBasicGuidArtifact1">
@@ -38,164 +37,130 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "RemoteBasicGuidArtifact1", propOrder = {
- "modTypeGuid",
- "branchGuid",
- "artTypeGuid",
- "artGuid",
- "attributes",
- "toArtTypeGuid"
-})
-public class RemoteBasicGuidArtifact1
- extends RemoteEvent
-{
-
- @XmlElement(required = true)
- protected String modTypeGuid;
- @XmlElement(required = true)
- protected String branchGuid;
- protected long artTypeGuid;
- @XmlElement(required = true)
- protected String artGuid;
- @XmlElement(required = true)
- protected List<RemoteAttributeChange1> attributes;
- protected long toArtTypeGuid;
-
- /**
- * Gets the value of the modTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModTypeGuid() {
- return modTypeGuid;
- }
-
- /**
- * Sets the value of the modTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModTypeGuid(String value) {
- this.modTypeGuid = value;
- }
-
- /**
- * 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 artTypeGuid property.
- *
- */
- public long getArtTypeGuid() {
- return artTypeGuid;
- }
-
- /**
- * Sets the value of the artTypeGuid property.
- *
- */
- public void setArtTypeGuid(long value) {
- this.artTypeGuid = value;
- }
-
- /**
- * Gets the value of the artGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getArtGuid() {
- return artGuid;
- }
-
- /**
- * Sets the value of the artGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setArtGuid(String value) {
- this.artGuid = value;
- }
-
- /**
- * Gets the value of the attributes 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 attributes property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAttributes().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RemoteAttributeChange1 }
- *
- *
- */
- public List<RemoteAttributeChange1> getAttributes() {
- if (attributes == null) {
- attributes = new ArrayList<RemoteAttributeChange1>();
- }
- return this.attributes;
- }
-
- /**
- * Gets the value of the toArtTypeGuid property.
- *
- */
- public long getToArtTypeGuid() {
- return toArtTypeGuid;
- }
-
- /**
- * Sets the value of the toArtTypeGuid property.
- *
- */
- public void setToArtTypeGuid(long value) {
- this.toArtTypeGuid = value;
- }
+ "modTypeGuid",
+ "branchGuid",
+ "artTypeGuid",
+ "artGuid",
+ "attributes",
+ "toArtTypeGuid"})
+public class RemoteBasicGuidArtifact1 extends RemoteEvent {
+
+ @XmlElement(required = true)
+ protected String modTypeGuid;
+ @XmlElement(required = true)
+ protected String branchGuid;
+ protected long artTypeGuid;
+ @XmlElement(required = true)
+ protected String artGuid;
+ @XmlElement(required = true)
+ protected List<RemoteAttributeChange1> attributes;
+ protected long toArtTypeGuid;
+
+ /**
+ * Gets the value of the modTypeGuid property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getModTypeGuid() {
+ return modTypeGuid;
+ }
+
+ /**
+ * Sets the value of the modTypeGuid property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setModTypeGuid(String value) {
+ this.modTypeGuid = value;
+ }
+
+ /**
+ * 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 artTypeGuid property.
+ */
+ public long getArtTypeGuid() {
+ return artTypeGuid;
+ }
+
+ /**
+ * Sets the value of the artTypeGuid property.
+ */
+ public void setArtTypeGuid(long value) {
+ this.artTypeGuid = value;
+ }
+
+ /**
+ * Gets the value of the artGuid property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getArtGuid() {
+ return artGuid;
+ }
+
+ /**
+ * Sets the value of the artGuid property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setArtGuid(String value) {
+ this.artGuid = value;
+ }
+
+ /**
+ * Gets the value of the attributes 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 attributes property.
+ * <p>
+ * For example, to add a new item, do as follows:
+ *
+ * <pre>
+ * getAttributes().add(newItem);
+ * </pre>
+ * <p>
+ * Objects of the following type(s) are allowed in the list {@link RemoteAttributeChange1 }
+ */
+ public List<RemoteAttributeChange1> getAttributes() {
+ if (attributes == null) {
+ attributes = new ArrayList<RemoteAttributeChange1>();
+ }
+ return this.attributes;
+ }
+
+ /**
+ * Gets the value of the toArtTypeGuid property.
+ */
+ public long getToArtTypeGuid() {
+ return toArtTypeGuid;
+ }
+
+ /**
+ * Sets the value of the toArtTypeGuid property.
+ */
+ public void setToArtTypeGuid(long value) {
+ this.toArtTypeGuid = value;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java
index 21f7210..e856ce7 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java
@@ -1,11 +1,10 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.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: 2011.08.22 at 10:40:57 AM MST
+// Generated on: 2012.09.14 at 05:06:42 PM MST
//
-
package org.eclipse.osee.framework.messaging.event.res.msgs;
import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,11 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
-
/**
- * <p>Java class for RemoteBasicGuidRelation1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * Java class for RemoteBasicGuidRelation1 complex type.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="RemoteBasicGuidRelation1">
@@ -40,240 +39,195 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "RemoteBasicGuidRelation1", propOrder = {
- "modTypeGuid",
- "branchGuid",
- "relTypeGuid",
- "relationId",
- "gammaId",
- "artAId",
- "artA",
- "artBId",
- "artB",
- "rationale"
-})
-public class RemoteBasicGuidRelation1
- extends RemoteEvent
-{
-
- @XmlElement(required = true)
- protected String modTypeGuid;
- @XmlElement(required = true)
- protected String branchGuid;
- protected long relTypeGuid;
- protected int relationId;
- protected int gammaId;
- protected int artAId;
- @XmlElement(required = true)
- protected RemoteBasicGuidArtifact1 artA;
- protected int artBId;
- @XmlElement(required = true)
- protected RemoteBasicGuidArtifact1 artB;
- @XmlElement(required = true)
- protected String rationale;
-
- /**
- * Gets the value of the modTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModTypeGuid() {
- return modTypeGuid;
- }
-
- /**
- * Sets the value of the modTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModTypeGuid(String value) {
- this.modTypeGuid = value;
- }
-
- /**
- * 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 relTypeGuid property.
- *
- */
- public long getRelTypeGuid() {
- return relTypeGuid;
- }
-
- /**
- * Sets the value of the relTypeGuid property.
- *
- */
- public void setRelTypeGuid(long value) {
- this.relTypeGuid = value;
- }
-
- /**
- * Gets the value of the relationId property.
- *
- */
- public int getRelationId() {
- return relationId;
- }
-
- /**
- * Sets the value of the relationId property.
- *
- */
- public void setRelationId(int value) {
- this.relationId = value;
- }
-
- /**
- * Gets the value of the gammaId property.
- *
- */
- public int getGammaId() {
- return gammaId;
- }
-
- /**
- * Sets the value of the gammaId property.
- *
- */
- public void setGammaId(int value) {
- this.gammaId = value;
- }
-
- /**
- * Gets the value of the artAId property.
- *
- */
- public int getArtAId() {
- return artAId;
- }
-
- /**
- * Sets the value of the artAId property.
- *
- */
- public void setArtAId(int value) {
- this.artAId = value;
- }
-
- /**
- * Gets the value of the artA property.
- *
- * @return
- * possible object is
- * {@link RemoteBasicGuidArtifact1 }
- *
- */
- public RemoteBasicGuidArtifact1 getArtA() {
- return artA;
- }
-
- /**
- * Sets the value of the artA property.
- *
- * @param value
- * allowed object is
- * {@link RemoteBasicGuidArtifact1 }
- *
- */
- public void setArtA(RemoteBasicGuidArtifact1 value) {
- this.artA = value;
- }
-
- /**
- * Gets the value of the artBId property.
- *
- */
- public int getArtBId() {
- return artBId;
- }
-
- /**
- * Sets the value of the artBId property.
- *
- */
- public void setArtBId(int value) {
- this.artBId = value;
- }
-
- /**
- * Gets the value of the artB property.
- *
- * @return
- * possible object is
- * {@link RemoteBasicGuidArtifact1 }
- *
- */
- public RemoteBasicGuidArtifact1 getArtB() {
- return artB;
- }
-
- /**
- * Sets the value of the artB property.
- *
- * @param value
- * allowed object is
- * {@link RemoteBasicGuidArtifact1 }
- *
- */
- public void setArtB(RemoteBasicGuidArtifact1 value) {
- this.artB = value;
- }
-
- /**
- * Gets the value of the rationale property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRationale() {
- return rationale;
- }
-
- /**
- * Sets the value of the rationale property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setRationale(String value) {
- this.rationale = value;
- }
+ "modTypeGuid",
+ "branchGuid",
+ "relTypeGuid",
+ "relationId",
+ "gammaId",
+ "artAId",
+ "artA",
+ "artBId",
+ "artB",
+ "rationale"})
+public class RemoteBasicGuidRelation1 extends RemoteEvent {
+
+ @XmlElement(required = true)
+ protected String modTypeGuid;
+ @XmlElement(required = true)
+ protected String branchGuid;
+ protected long relTypeGuid;
+ protected int relationId;
+ protected int gammaId;
+ protected int artAId;
+ @XmlElement(required = true)
+ protected RemoteBasicGuidArtifact1 artA;
+ protected int artBId;
+ @XmlElement(required = true)
+ protected RemoteBasicGuidArtifact1 artB;
+ @XmlElement(required = true)
+ protected String rationale;
+
+ /**
+ * Gets the value of the modTypeGuid property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getModTypeGuid() {
+ return modTypeGuid;
+ }
+
+ /**
+ * Sets the value of the modTypeGuid property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setModTypeGuid(String value) {
+ this.modTypeGuid = value;
+ }
+
+ /**
+ * 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 relTypeGuid property.
+ */
+ public long getRelTypeGuid() {
+ return relTypeGuid;
+ }
+
+ /**
+ * Sets the value of the relTypeGuid property.
+ */
+ public void setRelTypeGuid(long value) {
+ this.relTypeGuid = value;
+ }
+
+ /**
+ * Gets the value of the relationId property.
+ */
+ public int getRelationId() {
+ return relationId;
+ }
+
+ /**
+ * Sets the value of the relationId property.
+ */
+ public void setRelationId(int value) {
+ this.relationId = value;
+ }
+
+ /**
+ * Gets the value of the gammaId property.
+ */
+ public int getGammaId() {
+ return gammaId;
+ }
+
+ /**
+ * Sets the value of the gammaId property.
+ */
+ public void setGammaId(int value) {
+ this.gammaId = value;
+ }
+
+ /**
+ * Gets the value of the artAId property.
+ */
+ public int getArtAId() {
+ return artAId;
+ }
+
+ /**
+ * Sets the value of the artAId property.
+ */
+ public void setArtAId(int value) {
+ this.artAId = value;
+ }
+
+ /**
+ * Gets the value of the artA property.
+ *
+ * @return possible object is {@link RemoteBasicGuidArtifact1 }
+ */
+ public RemoteBasicGuidArtifact1 getArtA() {
+ return artA;
+ }
+
+ /**
+ * Sets the value of the artA property.
+ *
+ * @param value allowed object is {@link RemoteBasicGuidArtifact1 }
+ */
+ public void setArtA(RemoteBasicGuidArtifact1 value) {
+ this.artA = value;
+ }
+
+ /**
+ * Gets the value of the artBId property.
+ */
+ public int getArtBId() {
+ return artBId;
+ }
+
+ /**
+ * Sets the value of the artBId property.
+ */
+ public void setArtBId(int value) {
+ this.artBId = value;
+ }
+
+ /**
+ * Gets the value of the artB property.
+ *
+ * @return possible object is {@link RemoteBasicGuidArtifact1 }
+ */
+ public RemoteBasicGuidArtifact1 getArtB() {
+ return artB;
+ }
+
+ /**
+ * Sets the value of the artB property.
+ *
+ * @param value allowed object is {@link RemoteBasicGuidArtifact1 }
+ */
+ public void setArtB(RemoteBasicGuidArtifact1 value) {
+ this.artB = value;
+ }
+
+ /**
+ * Gets the value of the rationale property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getRationale() {
+ return rationale;
+ }
+
+ /**
+ * Sets the value of the rationale property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setRationale(String value) {
+ this.rationale = value;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelationReorder1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelationReorder1.java
index abad351..77b2efa 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelationReorder1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelationReorder1.java
@@ -1,11 +1,10 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.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: 2011.08.22 at 10:40:57 AM MST
+// Generated on: 2012.09.14 at 05:06:42 PM MST
//
-
package org.eclipse.osee.framework.messaging.event.res.msgs;
import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,11 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
-
/**
- * <p>Java class for RemoteBasicGuidRelationReorder1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * Java class for RemoteBasicGuidRelationReorder1 complex type.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="RemoteBasicGuidRelationReorder1">
@@ -34,114 +33,85 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RemoteBasicGuidRelationReorder1", propOrder = {
- "modTypeGuid",
- "branchGuid",
- "relTypeGuid",
- "parentArt"
-})
-public class RemoteBasicGuidRelationReorder1
- extends RemoteEvent
-{
+@XmlType(name = "RemoteBasicGuidRelationReorder1", propOrder = {"modTypeGuid", "branchGuid", "relTypeGuid", "parentArt"})
+public class RemoteBasicGuidRelationReorder1 extends RemoteEvent {
- @XmlElement(required = true)
- protected String modTypeGuid;
- @XmlElement(required = true)
- protected String branchGuid;
- protected long relTypeGuid;
- @XmlElement(required = true)
- protected RemoteBasicGuidArtifact1 parentArt;
+ @XmlElement(required = true)
+ protected String modTypeGuid;
+ @XmlElement(required = true)
+ protected String branchGuid;
+ protected long relTypeGuid;
+ @XmlElement(required = true)
+ protected RemoteBasicGuidArtifact1 parentArt;
- /**
- * Gets the value of the modTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModTypeGuid() {
- return modTypeGuid;
- }
+ /**
+ * Gets the value of the modTypeGuid property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getModTypeGuid() {
+ return modTypeGuid;
+ }
- /**
- * Sets the value of the modTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModTypeGuid(String value) {
- this.modTypeGuid = value;
- }
+ /**
+ * Sets the value of the modTypeGuid property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setModTypeGuid(String value) {
+ this.modTypeGuid = value;
+ }
- /**
- * Gets the value of the branchGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBranchGuid() {
- return branchGuid;
- }
+ /**
+ * 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;
- }
+ /**
+ * 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 relTypeGuid property.
- *
- */
- public long getRelTypeGuid() {
- return relTypeGuid;
- }
+ /**
+ * Gets the value of the relTypeGuid property.
+ */
+ public long getRelTypeGuid() {
+ return relTypeGuid;
+ }
- /**
- * Sets the value of the relTypeGuid property.
- *
- */
- public void setRelTypeGuid(long value) {
- this.relTypeGuid = value;
- }
+ /**
+ * Sets the value of the relTypeGuid property.
+ */
+ public void setRelTypeGuid(long value) {
+ this.relTypeGuid = value;
+ }
- /**
- * Gets the value of the parentArt property.
- *
- * @return
- * possible object is
- * {@link RemoteBasicGuidArtifact1 }
- *
- */
- public RemoteBasicGuidArtifact1 getParentArt() {
- return parentArt;
- }
+ /**
+ * Gets the value of the parentArt property.
+ *
+ * @return possible object is {@link RemoteBasicGuidArtifact1 }
+ */
+ public RemoteBasicGuidArtifact1 getParentArt() {
+ return parentArt;
+ }
- /**
- * Sets the value of the parentArt property.
- *
- * @param value
- * allowed object is
- * {@link RemoteBasicGuidArtifact1 }
- *
- */
- public void setParentArt(RemoteBasicGuidArtifact1 value) {
- this.parentArt = value;
- }
+ /**
+ * Sets the value of the parentArt property.
+ *
+ * @param value allowed object is {@link RemoteBasicGuidArtifact1 }
+ */
+ public void setParentArt(RemoteBasicGuidArtifact1 value) {
+ this.parentArt = value;
+ }
}
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 8bb7fb1..9c9e236 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
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.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: 2011.08.22 at 10:40:57 AM MST
+// Generated on: 2012.09.14 at 05:06:42 PM MST
//
package org.eclipse.osee.framework.messaging.event.res.msgs;
@@ -26,6 +26,7 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;sequence>
* &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="destinationBranchGuid" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
* &lt;element name="networkSender" type="{}RemoteNetworkSender1"/>
* &lt;/sequence>
* &lt;/restriction>
@@ -34,13 +35,18 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RemoteBranchEvent1", propOrder = {"eventTypeGuid", "branchGuid", "networkSender"})
+@XmlType(name = "RemoteBranchEvent1", propOrder = {
+ "eventTypeGuid",
+ "branchGuid",
+ "destinationBranchGuid",
+ "networkSender"})
public class RemoteBranchEvent1 extends RemoteEvent {
@XmlElement(required = true)
protected String eventTypeGuid;
@XmlElement(required = true)
protected String branchGuid;
+ protected String destinationBranchGuid;
@XmlElement(required = true)
protected RemoteNetworkSender1 networkSender;
@@ -81,11 +87,28 @@ public class RemoteBranchEvent1 extends RemoteEvent {
}
/**
+ * Gets the value of the destinationBranchGuid property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getDestinationBranchGuid() {
+ return destinationBranchGuid;
+ }
+
+ /**
+ * Sets the value of the destinationBranchGuid property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setDestinationBranchGuid(String value) {
+ this.destinationBranchGuid = value;
+ }
+
+ /**
* Gets the value of the networkSender property.
*
* @return possible object is {@link RemoteNetworkSender1 }
*/
- @Override
public RemoteNetworkSender1 getNetworkSender() {
return networkSender;
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBroadcastEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBroadcastEvent1.java
index d9371a3..fcb5ec9 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBroadcastEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBroadcastEvent1.java
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.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: 2011.08.22 at 10:40:57 AM MST
+// Generated on: 2012.09.14 at 05:06:42 PM MST
//
package org.eclipse.osee.framework.messaging.event.res.msgs;
@@ -112,7 +112,6 @@ public class RemoteBroadcastEvent1 extends RemoteEvent {
*
* @return possible object is {@link RemoteNetworkSender1 }
*/
- @Override
public RemoteNetworkSender1 getNetworkSender() {
return networkSender;
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteNetworkSender1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteNetworkSender1.java
index 538f231..3290191 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteNetworkSender1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteNetworkSender1.java
@@ -1,11 +1,10 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.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: 2011.08.22 at 10:40:57 AM MST
+// Generated on: 2012.09.14 at 05:06:42 PM MST
//
-
package org.eclipse.osee.framework.messaging.event.res.msgs;
import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,11 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
-
/**
- * <p>Java class for RemoteNetworkSender1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * Java class for RemoteNetworkSender1 complex type.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="RemoteNetworkSender1">
@@ -37,195 +36,152 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "RemoteNetworkSender1", propOrder = {
- "sourceObject",
- "sessionId",
- "machineName",
- "userId",
- "machineIp",
- "clientVersion",
- "port"
-})
-public class RemoteNetworkSender1
- extends RemoteEvent
-{
-
- @XmlElement(required = true)
- protected String sourceObject;
- @XmlElement(required = true)
- protected String sessionId;
- @XmlElement(required = true)
- protected String machineName;
- @XmlElement(required = true)
- protected String userId;
- @XmlElement(required = true)
- protected String machineIp;
- @XmlElement(required = true)
- protected String clientVersion;
- protected int port;
-
- /**
- * Gets the value of the sourceObject property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSourceObject() {
- return sourceObject;
- }
-
- /**
- * Sets the value of the sourceObject property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSourceObject(String value) {
- this.sourceObject = value;
- }
-
- /**
- * Gets the value of the sessionId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSessionId() {
- return sessionId;
- }
-
- /**
- * Sets the value of the sessionId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSessionId(String value) {
- this.sessionId = value;
- }
-
- /**
- * Gets the value of the machineName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMachineName() {
- return machineName;
- }
-
- /**
- * Sets the value of the machineName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMachineName(String value) {
- this.machineName = value;
- }
-
- /**
- * Gets the value of the userId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getUserId() {
- return userId;
- }
-
- /**
- * Sets the value of the userId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setUserId(String value) {
- this.userId = value;
- }
-
- /**
- * Gets the value of the machineIp property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMachineIp() {
- return machineIp;
- }
-
- /**
- * Sets the value of the machineIp property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMachineIp(String value) {
- this.machineIp = value;
- }
-
- /**
- * Gets the value of the clientVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getClientVersion() {
- return clientVersion;
- }
-
- /**
- * Sets the value of the clientVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setClientVersion(String value) {
- this.clientVersion = value;
- }
-
- /**
- * Gets the value of the port property.
- *
- */
- public int getPort() {
- return port;
- }
-
- /**
- * Sets the value of the port property.
- *
- */
- public void setPort(int value) {
- this.port = value;
- }
+ "sourceObject",
+ "sessionId",
+ "machineName",
+ "userId",
+ "machineIp",
+ "clientVersion",
+ "port"})
+public class RemoteNetworkSender1 extends RemoteEvent {
+
+ @XmlElement(required = true)
+ protected String sourceObject;
+ @XmlElement(required = true)
+ protected String sessionId;
+ @XmlElement(required = true)
+ protected String machineName;
+ @XmlElement(required = true)
+ protected String userId;
+ @XmlElement(required = true)
+ protected String machineIp;
+ @XmlElement(required = true)
+ protected String clientVersion;
+ protected int port;
+
+ /**
+ * Gets the value of the sourceObject property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getSourceObject() {
+ return sourceObject;
+ }
+
+ /**
+ * Sets the value of the sourceObject property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setSourceObject(String value) {
+ this.sourceObject = value;
+ }
+
+ /**
+ * Gets the value of the sessionId property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getSessionId() {
+ return sessionId;
+ }
+
+ /**
+ * Sets the value of the sessionId property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setSessionId(String value) {
+ this.sessionId = value;
+ }
+
+ /**
+ * Gets the value of the machineName property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getMachineName() {
+ return machineName;
+ }
+
+ /**
+ * Sets the value of the machineName property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setMachineName(String value) {
+ this.machineName = value;
+ }
+
+ /**
+ * Gets the value of the userId property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getUserId() {
+ return userId;
+ }
+
+ /**
+ * Sets the value of the userId property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setUserId(String value) {
+ this.userId = value;
+ }
+
+ /**
+ * Gets the value of the machineIp property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getMachineIp() {
+ return machineIp;
+ }
+
+ /**
+ * Sets the value of the machineIp property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setMachineIp(String value) {
+ this.machineIp = value;
+ }
+
+ /**
+ * Gets the value of the clientVersion property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getClientVersion() {
+ return clientVersion;
+ }
+
+ /**
+ * Sets the value of the clientVersion property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setClientVersion(String value) {
+ this.clientVersion = value;
+ }
+
+ /**
+ * Gets the value of the port property.
+ */
+ public int getPort() {
+ return port;
+ }
+
+ /**
+ * Sets the value of the port property.
+ */
+ public void setPort(int value) {
+ this.port = value;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java
index a039c90..be03ce2 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.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: 2011.08.22 at 10:40:57 AM MST
+// Generated on: 2012.09.14 at 05:06:42 PM MST
//
package org.eclipse.osee.framework.messaging.event.res.msgs;
@@ -163,7 +163,6 @@ public class RemotePersistEvent1 extends RemoteEvent {
*
* @return possible object is {@link RemoteNetworkSender1 }
*/
- @Override
public RemoteNetworkSender1 getNetworkSender() {
return networkSender;
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionChange1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionChange1.java
index 432711d..7962cdb 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionChange1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionChange1.java
@@ -1,11 +1,10 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.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: 2011.08.22 at 10:40:57 AM MST
+// Generated on: 2012.09.14 at 05:06:42 PM MST
//
-
package org.eclipse.osee.framework.messaging.event.res.msgs;
import java.util.ArrayList;
@@ -16,11 +15,11 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
-
/**
- * <p>Java class for RemoteTransactionChange1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * Java class for RemoteTransactionChange1 complex type.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="RemoteTransactionChange1">
@@ -35,92 +34,69 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RemoteTransactionChange1", propOrder = {
- "branchGuid",
- "transactionId",
- "artifacts"
-})
-public class RemoteTransactionChange1
- extends RemoteEvent
-{
+@XmlType(name = "RemoteTransactionChange1", propOrder = {"branchGuid", "transactionId", "artifacts"})
+public class RemoteTransactionChange1 extends RemoteEvent {
- @XmlElement(required = true)
- protected String branchGuid;
- protected int transactionId;
- @XmlElement(required = true)
- protected List<RemoteBasicGuidArtifact1> artifacts;
+ @XmlElement(required = true)
+ protected String branchGuid;
+ protected int transactionId;
+ @XmlElement(required = true)
+ protected List<RemoteBasicGuidArtifact1> artifacts;
- /**
- * Gets the value of the branchGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBranchGuid() {
- return branchGuid;
- }
+ /**
+ * 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;
- }
+ /**
+ * 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;
- }
+ /**
+ * 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;
- }
+ /**
+ * 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 RemoteBasicGuidArtifact1 }
- *
- *
- */
- public List<RemoteBasicGuidArtifact1> getArtifacts() {
- if (artifacts == null) {
- artifacts = new ArrayList<RemoteBasicGuidArtifact1>();
- }
- return this.artifacts;
- }
+ /**
+ * 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 RemoteBasicGuidArtifact1 }
+ */
+ public List<RemoteBasicGuidArtifact1> getArtifacts() {
+ if (artifacts == null) {
+ artifacts = new ArrayList<RemoteBasicGuidArtifact1>();
+ }
+ return this.artifacts;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionEvent1.java
index bec50f6..e9430bc 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionEvent1.java
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.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: 2011.08.22 at 10:40:57 AM MST
+// Generated on: 2012.09.14 at 05:06:42 PM MST
//
package org.eclipse.osee.framework.messaging.event.res.msgs;
@@ -91,7 +91,6 @@ public class RemoteTransactionEvent1 extends RemoteEvent {
*
* @return possible object is {@link RemoteNetworkSender1 }
*/
- @Override
public RemoteNetworkSender1 getNetworkSender() {
return networkSender;
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
index 16d2f84..1d958c7 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
@@ -68,7 +68,6 @@ import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.messaging.event.res.AttributeEventModificationType;
import org.eclipse.osee.framework.skynet.core.AccessPolicy;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.User;
@@ -1531,20 +1530,7 @@ public class Artifact extends NamedIdentity<String> implements IArtifact, IAdapt
for (Attribute<?> attribute : internalGetAttributes()) {
if (attribute.isDirty()) {
- AttributeChange change = new AttributeChange();
- change.setAttrTypeGuid(attribute.getAttributeType().getGuid());
- change.setGammaId(attribute.getGammaId());
- change.setAttributeId(attribute.getId());
- change.setModTypeGuid(AttributeEventModificationType.getType(attribute.getModificationType()).getGuid());
- for (Object obj : attribute.getAttributeDataProvider().getData()) {
- if (obj == null) {
- change.getData().add("");
- } else if (obj instanceof String) {
- change.getData().add((String) obj);
- } else {
- OseeLog.log(Activator.class, Level.SEVERE, "Unhandled data type " + obj.getClass().getSimpleName());
- }
- }
+ AttributeChange change = attribute.createAttributeChangeFromSelf();
dirtyAttributes.add(change);
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java
index 3d7183d..fe592ce 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java
@@ -21,13 +21,16 @@ import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.model.type.AttributeType;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.messaging.event.res.AttributeEventModificationType;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.providers.IAttributeDataProvider;
+import org.eclipse.osee.framework.skynet.core.event.model.AttributeChange;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
/**
@@ -73,6 +76,26 @@ public abstract class Attribute<T> implements Comparable<Attribute<T>> {
// provided for subclass implementation
}
+ public AttributeChange createAttributeChangeFromSelf() throws OseeDataStoreException {
+ AttributeChange attributeChange = new AttributeChange();
+
+ attributeChange.setAttrTypeGuid(attributeType.getGuid());
+ attributeChange.setGammaId(gammaId);
+ attributeChange.setAttributeId(attrId);
+ attributeChange.setModTypeGuid(AttributeEventModificationType.getType(modificationType).getGuid());
+ for (Object obj : attributeDataProvider.getData()) {
+ if (obj == null) {
+ attributeChange.getData().add("");
+ } else if (obj instanceof String) {
+ attributeChange.getData().add((String) obj);
+ } else {
+ OseeLog.log(Activator.class, Level.SEVERE, "Unhandled data type " + obj.getClass().getSimpleName());
+ }
+ }
+
+ return attributeChange;
+ }
+
public void internalInitialize(IAttributeType attributeType, Artifact artifact, ModificationType modificationType, int attributeId, int gammaId, boolean markDirty, boolean setDefaultValue) throws OseeCoreException {
internalInitialize(attributeType, artifact, modificationType, markDirty, setDefaultValue);
this.attrId = attributeId;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java
index 1efddf0..6d33daa 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java
@@ -137,6 +137,7 @@ public final class FrameworkEventUtil {
RemoteBranchEvent1 event = new RemoteBranchEvent1();
event.setEventTypeGuid(branchEvent.getEventType().getGuid());
event.setBranchGuid(branchEvent.getBranchGuid());
+ event.setDestinationBranchGuid(branchEvent.getDestinationBranchGuid());
event.setNetworkSender(getRemoteNetworkSender(branchEvent.getNetworkSender()));
return event;
}
@@ -144,7 +145,8 @@ public final class FrameworkEventUtil {
public static BranchEvent getBranchEvent(RemoteBranchEvent1 branchEvent) {
BranchEventType branchEventType = BranchEventType.getByGuid(branchEvent.getEventTypeGuid());
if (branchEventType != null) {
- BranchEvent event = new BranchEvent(branchEventType, branchEvent.getBranchGuid());
+ BranchEvent event =
+ new BranchEvent(branchEventType, branchEvent.getBranchGuid(), branchEvent.getDestinationBranchGuid());
event.setNetworkSender(getNetworkSender(branchEvent.getNetworkSender()));
return event;
} else {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java
index 47e1c34..7d575b0 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.event.model;
-
public class BranchEvent implements FrameworkEvent, HasNetworkSender {
private String branchGuid;
+ private String destinationBranchGuid;
private BranchEventType eventType;
private NetworkSender networkSender;
@@ -22,6 +22,12 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender {
this.eventType = branchEventType;
}
+ public BranchEvent(BranchEventType branchEventType, String sourceBranchGuid, String destinationBranchGuid) {
+ this.branchGuid = sourceBranchGuid;
+ this.destinationBranchGuid = destinationBranchGuid;
+ this.eventType = branchEventType;
+ }
+
/**
* Gets the value of the branchGuid property.
*
@@ -31,8 +37,18 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender {
return branchGuid;
}
+ // TODO: add comment to describe purpose of destinationBranch
+ /**
+ * Gets the value of the destinationBranchGuid property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getDestinationBranchGuid() {
+ return destinationBranchGuid;
+ }
+
/**
- * Sets the value of the branchGuid property.
+ * Sets the value of the BranchGuid property.
*
* @param value allowed object is {@link String }
*/
@@ -41,6 +57,15 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender {
}
/**
+ * Sets the value of the destinationBranchGuid property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setDestinationBranchGuid(String value) {
+ this.destinationBranchGuid = value;
+ }
+
+ /**
* Gets the value of the networkSender property.
*
* @return possible object is {@link NetworkSender }
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CommitBranchHttpRequestOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CommitBranchHttpRequestOperation.java
index 681987c..bdf0d1f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CommitBranchHttpRequestOperation.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CommitBranchHttpRequestOperation.java
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.httpRequests;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -24,21 +26,31 @@ import org.eclipse.osee.framework.core.message.BranchCommitRequest;
import org.eclipse.osee.framework.core.message.BranchCommitResponse;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.TransactionRecord;
+import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidRelation;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
-import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
+import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.skynet.core.AccessPolicy;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
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.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.HttpClientMessage;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
+import org.eclipse.osee.framework.skynet.core.change.AttributeChange;
+import org.eclipse.osee.framework.skynet.core.change.Change;
+import org.eclipse.osee.framework.skynet.core.change.RelationChange;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
+import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event.model.BranchEvent;
import org.eclipse.osee.framework.skynet.core.event.model.BranchEventType;
+import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidRelation;
+import org.eclipse.osee.framework.skynet.core.event.model.EventModifiedBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil;
+import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
+import org.eclipse.osee.framework.skynet.core.revision.ChangeManager;
+import org.eclipse.osee.framework.skynet.core.revision.LoadChangeType;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
/**
@@ -51,9 +63,6 @@ public final class CommitBranchHttpRequestOperation extends AbstractOperation {
private final Branch destinationBranch;
private final boolean isArchiveAllowed;
- private static final String ARTIFACT_CHANGES =
- "SELECT av.art_id, txs1.branch_id FROM osee_txs txs1, osee_artifact av WHERE txs1.branch_id = ? AND txs1.transaction_id = ? AND txs1.gamma_id = av.gamma_id " + "UNION ALL " + "SELECT art.art_id, txs2.branch_id FROM osee_txs txs2, osee_relation_link rel, osee_artifact art WHERE txs2.branch_id = ? and txs2.transaction_id = ? AND txs2.gamma_id = rel.gamma_id AND (rel.a_art_id = art.art_id OR rel.b_art_id = art.art_id) " + "UNION ALL " + "SELECT att.art_id, txs3.branch_id FROM osee_txs txs3, osee_attribute att WHERE txs3.branch_id = ? AND txs3.transaction_id = ? AND txs3.gamma_id = att.gamma_id";
-
public CommitBranchHttpRequestOperation(User user, Branch sourceBranch, Branch destinationBranch, boolean isArchiveAllowed) {
super("Commit " + sourceBranch, Activator.PLUGIN_ID);
this.user = user;
@@ -70,7 +79,9 @@ public final class CommitBranchHttpRequestOperation extends AbstractOperation {
BranchState currentState = sourceBranch.getBranchState();
sourceBranch.setBranchState(BranchState.COMMIT_IN_PROGRESS);
- OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.Committing, sourceBranch.getGuid()));
+ BranchEvent branchEvent =
+ new BranchEvent(BranchEventType.Committing, sourceBranch.getGuid(), destinationBranch.getGuid());
+ OseeEventManager.kickBranchEvent(getClass(), branchEvent);
BranchCommitRequest requestData =
new BranchCommitRequest(user.getArtId(), sourceBranch.getId(), destinationBranch.getId(), isArchiveAllowed);
@@ -88,14 +99,15 @@ public final class CommitBranchHttpRequestOperation extends AbstractOperation {
}
if (response != null) {
- handleResponse(response, sourceBranch);
+ handleResponse(response, monitor, sourceBranch, destinationBranch);
}
}
- private void handleResponse(BranchCommitResponse response, Branch sourceBranch) throws OseeCoreException {
+ private void handleResponse(BranchCommitResponse response, IProgressMonitor monitor, Branch sourceBranch, Branch destinationBranch) throws OseeCoreException {
TransactionRecord newTransaction = response.getTransaction();
AccessPolicy accessPolicy = ServiceUtil.getAccessPolicy();
accessPolicy.removePermissions(sourceBranch);
+
// Update commit artifact cache with new information
if (sourceBranch.getAssociatedArtifactId() > 0) {
TransactionManager.cacheCommittedArtifactTransaction(BranchManager.getAssociatedArtifact(sourceBranch),
@@ -103,35 +115,75 @@ public final class CommitBranchHttpRequestOperation extends AbstractOperation {
}
BranchManager.getCache().reloadCache();
- reloadCommittedArtifacts(newTransaction);
+ Collection<Change> changes = new ArrayList<Change>();
+ IOperation operation = ChangeManager.comparedToPreviousTx(newTransaction, changes);
+ doSubWork(operation, monitor, 1.0);
+ handleArtifactEvents(newTransaction, changes);
- OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.Committed, sourceBranch.getGuid()));
+ OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.Committed, sourceBranch.getGuid(),
+ destinationBranch.getGuid()));
}
- private void reloadCommittedArtifacts(TransactionRecord newTransaction) throws OseeCoreException {
- Branch txBranch = BranchManager.getBranch(newTransaction.getBranchId());
- IOseeStatement chStmt = ConnectionHandler.getStatement();
- try {
- Set<Artifact> artifacts = new HashSet<Artifact>();
- Object[] queryData =
- new Object[] {
- newTransaction.getBranchId(),
- newTransaction.getId(),
- newTransaction.getBranchId(),
- newTransaction.getId(),
- newTransaction.getBranchId(),
- newTransaction.getId()};
- chStmt.runPreparedQuery(ARTIFACT_CHANGES, queryData);
- while (chStmt.next()) {
- int artId = chStmt.getInt("art_id");
- Artifact artifact = ArtifactCache.getActive(artId, txBranch);
- if (artifact != null) {
- artifacts.add(artifact);
- }
+ private void handleArtifactEvents(TransactionRecord newTransaction, Collection<Change> changes) throws OseeCoreException {
+ ArtifactEvent artifactEvent = new ArtifactEvent(newTransaction.getBranch());
+ artifactEvent.setTransactionId(newTransaction.getId());
+
+ Map<String, EventModifiedBasicGuidArtifact> artEventMap = new HashMap<String, EventModifiedBasicGuidArtifact>();
+ Set<Artifact> artifacts = new HashSet<Artifact>();
+
+ for (Change change : changes) {
+ LoadChangeType changeType = change.getChangeType();
+ switch (changeType) {
+ case artifact:
+ // Don't do anything. When kicking Persist event to all clients we need only to create the artifact changed based on the Changed Attributes
+ break;
+ case relation:
+ RelationChange relChange = ((RelationChange) change);
+ RelationEventType relationEventType =
+ change.getModificationType().isDeleted() ? RelationEventType.Deleted : change.getModificationType().isUnDeleted() ? RelationEventType.Undeleted : RelationEventType.Added;
+
+ DefaultBasicGuidRelation defaultBasicGuidRelation =
+ new DefaultBasicGuidRelation(relChange.getBranch().getGuid(), relChange.getRelationType().getGuid(),
+ relChange.getItemId(), (int) relChange.getGamma(),
+ relChange.getChangeArtifact().getBasicGuidArtifact(),
+ relChange.getEndTxBArtifact().getBasicGuidArtifact());
+ EventBasicGuidRelation event =
+ new EventBasicGuidRelation(relationEventType, relChange.getArtId(), relChange.getBArtId(),
+ defaultBasicGuidRelation);
+ event.setRationale(relChange.getRationale());
+ artifactEvent.getRelations().add(event);
+ break;
+ case attribute:
+ Artifact changedArtifact = change.getChangeArtifact();
+ if (changedArtifact != null) {
+
+ // Only reload items that were already in the active cache
+ Artifact artifact = ArtifactCache.getActive(changedArtifact.getArtId(), newTransaction.getBranch());
+ if (artifact != null) {
+ artifacts.add(artifact);
+ }
+
+ String artifactId = changedArtifact.getGuid();
+ EventModifiedBasicGuidArtifact artEvent = artEventMap.get(artifactId);
+ if (artEvent == null) {
+ artEvent =
+ new EventModifiedBasicGuidArtifact(newTransaction.getBranch().getGuid(),
+ changedArtifact.getArtTypeGuid(), artifactId,
+ new ArrayList<org.eclipse.osee.framework.skynet.core.event.model.AttributeChange>());
+ artifactEvent.getArtifacts().add(artEvent);
+ }
+ AttributeChange attributeChange = (AttributeChange) change;
+ Attribute<?> attribute = attributeChange.getAttribute();
+ artEvent.getAttributeChanges().add(attribute.createAttributeChangeFromSelf());
+ }
+ break;
+ default:
+ break;
}
- ArtifactQuery.reloadArtifacts(artifacts);
- } finally {
- chStmt.close();
}
+
+ ArtifactQuery.reloadArtifacts(artifacts);
+ OseeEventManager.kickPersistEvent(getClass(), artifactEvent);
}
+
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java
index 0ceedf1..8835fad 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java
@@ -32,7 +32,7 @@ public class BranchEventHandler implements EventHandlerLocal<IBranchEventListene
List<? extends IEventFilter> filters = ((IEventFilteredListener) listener).getEventFilters();
if (filters != null) {
for (IEventFilter eventFilter : filters) {
- if (!eventFilter.isMatch(event.getBranchGuid())) {
+ if (!eventFilter.isMatch(event.getBranchGuid()) && !eventFilter.isMatch(event.getDestinationBranchGuid())) {
return;
}
}
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 ee8511e..1137c3a 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
@@ -1401,11 +1401,20 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
return;
}
if (branch.getGuid().equals(branchEvent.getBranchGuid())) {
- if ((branchEvent.getEventType() == BranchEventType.Committing || branchEvent.getEventType() == BranchEventType.Committed) && branch != null) {
+ if ((branchEvent.getEventType() == BranchEventType.Committing || branchEvent.getEventType() == BranchEventType.Committed)) {
SkynetViews.closeView(VIEW_ID, getViewSite().getSecondaryId());
} else {
refreshBranchWarning();
}
+ } else if (branch.getGuid().equals(branchEvent.getDestinationBranchGuid())) {
+ if ((branchEvent.getEventType() == BranchEventType.Committed)) {
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ getTreeViewer().refresh();
+ }
+ });
+ }
}
}