Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeremie.tatibouet2015-04-28 13:56:58 +0000
committerArnaud Cuccuru2015-04-30 11:47:46 +0000
commitbbdda04530c5901c986da88c550db65a146aede7 (patch)
treef18967d0e63785d1b1e636f4cd01c6710e43cd09 /extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text
parent03c212d7016556ba542f4e69024fc0228c85722e (diff)
downloadorg.eclipse.papyrus-bbdda04530c5901c986da88c550db65a146aede7.tar.gz
org.eclipse.papyrus-bbdda04530c5901c986da88c550db65a146aede7.tar.xz
org.eclipse.papyrus-bbdda04530c5901c986da88c550db65a146aede7.zip
Class, Signal, Enumeration, Datatype and package follows automatically
the evolution of the semantic model. ElementImport, Generalization, PackageImport impacts are also supported. Change-Id: I0178e33f270d8c542d8a6df68cc11b153732d6f2 Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr> Reviewed-on: https://git.eclipse.org/r/46748 Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Reviewed-on: https://git.eclipse.org/r/46799 Tested-by: Hudson CI
Diffstat (limited to 'extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text')
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java
index 16f0c0992c7..8616893ffb1 100644
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java
+++ b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java
@@ -168,7 +168,7 @@ public class AlfTextualRepresentation extends TextualRepresentation
* @return this - the current textual representation
*/
public AlfTextualRepresentation rebase(AlfTextualRepresentation representation) {
- if (this.getOwner() == representation.getOwner()) {
+ if (representation!= null && this.getOwner() == representation.getOwner()) {
BackupState state = new BackupState();
state.status = representation.getStatus();
state.timestamp = new Timestamp(representation.getModificationDate());

Back to the top