From 18008b3f4473e694ac96d6b7d4b5944c1b58858f Mon Sep 17 00:00:00 2001
From: Cedric Dumoulin
Date: Thu, 12 Dec 2013 09:42:45 +0100
Subject: First working RegExp
Add NotyfyingList and ExpressionMatcher
Update layers model.---
.../META-INF/MANIFEST.MF | 3 +-
.../model/layers.ecore | 4 +-
.../model/layers.notation | 22 +-
.../model/layers.uml | 6 +-
.../stackmodel/exprmatcher/ExpressionMatcher.java | 153 +++++++---
.../layers/stackmodel/layers/RegExpLayer.java | 8 +-
.../stackmodel/layers/impl/LayersPackageImpl.java | 4 +-
.../stackmodel/layers/impl/RegExpLayerImpl.java | 314 +++++++++++++++++++--
.../layers/stackmodel/util/NotyfyingList.java | 2 -
.../exprmatcher/ExpressionMatcherTest.java | 195 ++++++++++++-
.../layers/stackmodel/util/NotyfyingListTest.java | 2 +-
11 files changed, 617 insertions(+), 96 deletions(-)
(limited to 'extraplugins/layers/org.eclipse.papyrus.layers.stackmodel')
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF
index e86c17d97e2..19497f1825a 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore.xmi;bundle-version="2.9.0",
org.eclipse.uml2.uml;bundle-version="4.1.0",
org.eclipse.ocl.ecore;bundle-version="3.3.0",
- org.eclipse.emf.query.ocl;bundle-version="2.0.0"
+ org.eclipse.emf.query.ocl;bundle-version="2.0.0",
+ com.google.guava;bundle-version="11.0.2"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.ecore b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.ecore
index dd85962cf69..a491914feb3 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.ecore
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.ecore
@@ -405,7 +405,7 @@
-
@@ -416,7 +416,7 @@
-
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.notation b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.notation
index bcebd0a76d6..622401c1477 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.notation
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.notation
@@ -838,7 +838,7 @@
-
+
@@ -870,7 +870,7 @@
-
+
@@ -974,7 +974,7 @@
-
+
@@ -1057,7 +1057,7 @@
-
+
@@ -1249,7 +1249,7 @@
-
+
@@ -1337,7 +1337,7 @@
-
+
@@ -1369,7 +1369,7 @@
-
+
@@ -1473,8 +1473,8 @@
-
-
+
+
@@ -1593,7 +1593,7 @@
-
+
@@ -1614,7 +1614,7 @@
-
+
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.uml b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.uml
index 1c7c1bcb720..04dcde06218 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.uml
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.uml
@@ -908,8 +908,8 @@ This class carry a referenceto the Application.