Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2015-04-20 22:53:36 +0000
committerChristian W. Damus2015-04-20 23:00:28 +0000
commit8b2c949d797b9d128abd3e124dec03cde1613ebb (patch)
tree488711e0046507b0e1cea519875c4bbd7e6f2413 /plugins/infra/gmfdiag
parent96bb1415cf8f840af6cbebd4c63401749ae5597c (diff)
downloadorg.eclipse.papyrus-8b2c949d797b9d128abd3e124dec03cde1613ebb.tar.gz
org.eclipse.papyrus-8b2c949d797b9d128abd3e124dec03cde1613ebb.tar.xz
org.eclipse.papyrus-8b2c949d797b9d128abd3e124dec03cde1613ebb.zip
Revert "Bug 463294 : [drag and drop] develop a dnd for signal"
This reverts commit e6a37aa591119f8f80a868864d828f49c0d3e4ee because it causes all of the diagram tests to hang on a pop-up menu asking whether to "Drop" or to "Change the default strategy -> Drop" (bug 465025).
Diffstat (limited to 'plugins/infra/gmfdiag')
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF7
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/OSGI-INF/l10n/bundle.properties3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/build.properties3
3 files changed, 4 insertions, 9 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF
index ced4bb99389..6b309a0e10a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF
@@ -13,15 +13,14 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
org.eclipse.core.databinding;bundle-version="1.4.1",
org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0"
-Bundle-Vendor: %Bundle-Vendor
+ org.eclipse.papyrus.infra.viewpoints.policy
+Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.1.0.qualifier
-Bundle-Name: %Bundle-Name
+Bundle-Name: Customizable Drag and Drop
Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.dnd.Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.dnd;singleton:=
true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/OSGI-INF/l10n/bundle.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 8d21130b7c7..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.infra.gmfdiag.dnd
-Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Customizable Drag and Drop \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/build.properties
index ac1e3ed58e0..4ec4ed9fddd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/build.properties
@@ -4,6 +4,5 @@ bin.includes = META-INF/,\
.,\
about.html,\
plugin.xml,\
- schema/,\
- OSGI-INF/l10n/bundle.properties
+ schema/
src.includes = about.html

Back to the top