Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Noyrit2014-03-14 14:38:02 +0000
committerFlorian Noyrit2014-03-14 14:38:02 +0000
commitdb966ff2184bb3fd4d74a33ef497cfdad3af515e (patch)
treedbaf3f8fa665e44ac0a857e0129597e6d4aed357 /plugins/developer/org.eclipse.papyrus.def/xtend-gen
parent2cb1f82522505bb59b545e0e6abffea895ef7669 (diff)
parentcc47080b9acbd5c4abdc9043a19b7216eaf3197b (diff)
downloadorg.eclipse.papyrus-db966ff2184bb3fd4d74a33ef497cfdad3af515e.tar.gz
org.eclipse.papyrus-db966ff2184bb3fd4d74a33ef497cfdad3af515e.tar.xz
org.eclipse.papyrus-db966ff2184bb3fd4d74a33ef497cfdad3af515e.zip
Merge branch 'master' into committers/fnoyrit/gmft
Conflicts: plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/factory/CustomUMLeditPartFactory.java plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPart.java plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java
Diffstat (limited to 'plugins/developer/org.eclipse.papyrus.def/xtend-gen')
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/diagram/update/.gitignore1
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/parsers/.gitignore1
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/editpolicies/.gitignore2
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore1
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/editor/.gitignore1
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/navigator/.gitignore5
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/providers/.gitignore2
7 files changed, 13 insertions, 0 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/diagram/update/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/diagram/update/.gitignore
new file mode 100644
index 00000000000..ed6fc740e88
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/diagram/update/.gitignore
@@ -0,0 +1 @@
+/CanonicalUpdate.java
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/parsers/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/parsers/.gitignore
new file mode 100644
index 00000000000..c89b20955f1
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/impl/parsers/.gitignore
@@ -0,0 +1 @@
+/ParserProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/editpolicies/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/editpolicies/.gitignore
index 57853ad8884..5a3675f1bba 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/editpolicies/.gitignore
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/editpolicies/.gitignore
@@ -5,3 +5,5 @@
/NodeItemSemanticEditPolicy.java
/childContainerCreateCommand.java
/linkCommands.java
+/TextNonResizableEditPolicy.java
+/Utils_qvto.java
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore
index 5491bb95b62..3819cbf1bdf 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore
@@ -1 +1,2 @@
/DiagramUpdater.java
+/UpdateCommand.java
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/editor/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/editor/.gitignore
index a3e47795394..e9026f74121 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/editor/.gitignore
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/editor/.gitignore
@@ -3,3 +3,4 @@
/DiagramEditorContextMenuProvider.java
/VisualIDRegistry.java
/extensions.java
+/ActionBarContributor.java
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/navigator/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/navigator/.gitignore
index f437eccedca..8dde5108fd1 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/navigator/.gitignore
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/navigator/.gitignore
@@ -1,2 +1,7 @@
/NavigatorContentProvider.java
/NavigatorLinkHelper.java
+/AbstractNavigatorItem.java
+/DomainNavigatorContentProvider.java
+/DomainNavigatorItem.java
+/NavigatorGroup.java
+/NavigatorItem.java
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/providers/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/providers/.gitignore
index f452148cde7..34c0b8e53a8 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/providers/.gitignore
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/providers/.gitignore
@@ -3,3 +3,5 @@
/ValidationDecoratorProvider.java
/ValidationProvider.java
/extensions.java
+/ElementTypes.java
+/MarkerNavigationProvider.java

Back to the top