Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2015-02-18 11:52:29 +0000
committerVincent Lorenzo2015-02-18 14:03:30 +0000
commiteb09607cd4fe5b2545c0adacd0a03f51f19bd083 (patch)
treef722a078102042fa57b0028a865ab0b88e4b129f
parentc984b4700a718b800a8df6fb401345289c193dc5 (diff)
downloadorg.eclipse.papyrus-eb09607cd4fe5b2545c0adacd0a03f51f19bd083.tar.gz
org.eclipse.papyrus-eb09607cd4fe5b2545c0adacd0a03f51f19bd083.tar.xz
org.eclipse.papyrus-eb09607cd4fe5b2545c0adacd0a03f51f19bd083.zip
460098: [Table 2] Papyrus must use the new nattable release on branch master
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.table/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java13
-rw-r--r--plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF2
-rw-r--r--plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF2
-rw-r--r--plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF2
-rw-r--r--plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/StereotypeApplierCellEditorWrapper.java14
-rw-r--r--releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap2
-rw-r--r--releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap2
-rw-r--r--releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap2
-rw-r--r--releng/org.eclipse.papyrus.oomph/setups/papyrus.setup4
-rw-r--r--releng/top-pom-extra-tests.xml2
-rw-r--r--releng/top-pom-extras.xml2
-rw-r--r--releng/top-pom-main-tests.xml2
-rw-r--r--releng/top-pom-main.xml2
-rwxr-xr-xreleng/top-pom-rcp.xml2
-rw-r--r--tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java9
-rw-r--r--tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF2
-rwxr-xr-xtests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF2
-rwxr-xr-xtests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF2
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF2
33 files changed, 69 insertions, 35 deletions
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.table/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.table/META-INF/MANIFEST.MF
index 336ace93847..8b90f78eb29 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.table/META-INF/MANIFEST.MF
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.table/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.0.1",
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",
org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0"
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="1.2.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Description: This bundle provides a table for the ADL4Eclipse tool. This synchronized table should be created on a package, and displays all the bundles contained in this package
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
index de06adb48e1..16ddf03ac7d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Export-Package: org.eclipse.papyrus.infra.emf.nattable,
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="2.9.0",
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
@@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
ca.odell.glazedlists;bundle-version="1.9.0",
com.google.guava;bundle-version="15.0.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.2.0,2.0.0)"
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.1.0.qualifier
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
index 56c11636031..8e2dd2b4b7b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.edit,
org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.emf.transaction,
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
index 9bcaf74113e..e1fe7e03902 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",
org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.emf.databinding,
org.eclipse.core.databinding.property;bundle-version="1.4.200",
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
index 8cb2a986835..579f68cb61e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.1.0",
org.eclipse.emf.edit,
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
index e7613a07d07..1e70d29a686 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.emf.transaction;bundle-version="1.4.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.1.0",
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
org.eclipse.gmf.runtime.emf.type.core,
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
index 427322d4195..19c6bb9099f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
@@ -57,14 +57,14 @@ Require-Bundle: org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
org.eclipse.emf.edit.ui,
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.core.expressions,
org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",
com.google.guava;bundle-version="11.0.0",
org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",
org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.2.0,2.0.0)",
ca.odell.glazedlists;bundle-version="1.9.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0"
Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java
index 13275fc1464..ebe95a946c4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java
@@ -234,4 +234,17 @@ public class ColumnSortModel implements IPapyrusSortModel {
setAxisComparator();
}
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getColumnComparator(int)
+ *
+ * @param columnIndex
+ * @return
+ */
+ @Override
+ public Comparator<?> getColumnComparator(int columnIndex) {
+ // TODO Auto-generated method stub
+ //TODO : new method coming from nattable 1.2.0
+ return null;
+ }
+
}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF
index c52f77a07a2..0f4cbdf0f50 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.1.0",
org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",
org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.core.expressions
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
index cc94ebeaf69..fad7ce29055 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
org.eclipse.uml2.uml;bundle-version="4.1.0",
org.eclipse.papyrus.infra.tools;bundle-version="1.1.0"
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
index a53fa88d01b..39cdeabbedd 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.uml.nattable;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",
org.eclipse.uml2.uml;bundle-version="4.1.0",
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
index ba84e8a8079..894a5979061 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.uml.nattable;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.uml2.uml;bundle-version="4.1.0",
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF
index 21866532e31..bad15da2ce1 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF
@@ -12,9 +12,9 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.uml.nattable;bundle-version="1.1.0",
org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.1.0",
ca.odell.glazedlists;bundle-version="1.9.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.2.0,2.0.0)",
org.eclipse.emf.transaction;bundle-version="1.8.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
org.eclipse.uml2.uml;bundle-version="5.0.1",
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0"
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
index 000ac02c6a9..3bfd8e3af0a 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
org.eclipse.core.expressions,
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF
index 6964ea451be..512074724fd 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.1.0",
org.eclipse.xtext;bundle-version="2.4.2",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.gmf.runtime.common.core,
org.eclipse.gmf.runtime.common.ui.services
Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
index a8c9f980a25..1698d90a65c 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.uml2.uml;bundle-version="4.1.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/StereotypeApplierCellEditorWrapper.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/StereotypeApplierCellEditorWrapper.java
index 5b223dc0c67..45eab180657 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/StereotypeApplierCellEditorWrapper.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/StereotypeApplierCellEditorWrapper.java
@@ -429,4 +429,18 @@ public class StereotypeApplierCellEditorWrapper implements ICellEditor {
return wrappedCellEditor == null ? cellBounds : wrappedCellEditor.calculateControlBounds(cellBounds);
}
+ /**
+ * @see org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor#activateOnTraversal(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.util.List)
+ *
+ * @param configRegistry
+ * @param configLabels
+ * @return
+ */
+ @Override
+ public boolean activateOnTraversal(IConfigRegistry configRegistry, List<String> configLabels) {
+ // TODO Auto-generated method stub
+ //TODO : new method coming from nattable 1.2.0
+ return false;
+ }
+
}
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
index 72401c6b7b6..d2c908cac9a 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
@@ -461,7 +461,7 @@
</rm:provider>
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
- <rm:uri format="{0}/nattable/releases/1.1.0/repository/">
+ <rm:uri format="{0}/nattable/releases/1.2.0/repository/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap
index 25386c00bdb..1ee85e82a15 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap
@@ -401,7 +401,7 @@
<!-- </rm:provider> -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
- <rm:uri format="{0}/nattable/releases/1.1.0/repository/">
+ <rm:uri format="{0}/nattable/releases/1.2.0/repository/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
index 3da404b9a62..545c2705900 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
@@ -590,7 +590,7 @@
</rm:provider>
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
- <rm:uri format="{0}/nattable/releases/1.1.0/repository/">
+ <rm:uri format="{0}/nattable/releases/1.2.0/repository/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
index 44dc03e2b6c..d289083beda 100644
--- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
+++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
@@ -375,7 +375,7 @@
</annotation>
</repository>
<repository
- url="${base.downloads.url}/nattable/releases/1.1.0/repository/"/>
+ url="${base.downloads.url}/nattable/releases/1.2.0/repository/"/>
<repository
url="http://download.eclipse.org/xwt/release-1.1.0">
<annotation
@@ -564,7 +564,7 @@
</annotation>
</repository>
<repository
- url="${base.downloads.url}/nattable/releases/1.1.0/repository/"/>
+ url="${base.downloads.url}/nattable/releases/1.2.0/repository/"/>
</repositoryList>
</targlet>
<targlet
diff --git a/releng/top-pom-extra-tests.xml b/releng/top-pom-extra-tests.xml
index 270e7dd57d5..e9c61d365b7 100644
--- a/releng/top-pom-extra-tests.xml
+++ b/releng/top-pom-extra-tests.xml
@@ -173,7 +173,7 @@
<repository>
<id>nattable</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/nattable/releases/1.1.0/repository/</url>
+ <url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>
</repository>
<repository>
<id>orbit</id>
diff --git a/releng/top-pom-extras.xml b/releng/top-pom-extras.xml
index f778af486fa..60e4956a672 100644
--- a/releng/top-pom-extras.xml
+++ b/releng/top-pom-extras.xml
@@ -294,7 +294,7 @@
<repository>
<id>nattable</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/nattable/releases/1.1.0/repository/</url>
+ <url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>
</repository>
<repository>
<id>orbit</id>
diff --git a/releng/top-pom-main-tests.xml b/releng/top-pom-main-tests.xml
index bc1ef5bdccc..b4f98aaaefd 100644
--- a/releng/top-pom-main-tests.xml
+++ b/releng/top-pom-main-tests.xml
@@ -209,7 +209,7 @@
<repository>
<id>nattable</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/nattable/releases/1.1.0/repository/</url>
+ <url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>
</repository>
<repository>
<id>orbit</id>
diff --git a/releng/top-pom-main.xml b/releng/top-pom-main.xml
index fccd847500a..3a542b4e122 100644
--- a/releng/top-pom-main.xml
+++ b/releng/top-pom-main.xml
@@ -448,7 +448,7 @@
<repository>
<id>nattable</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/nattable/releases/1.1.0/repository/</url>
+ <url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>
</repository>
<repository>
<id>nebula-tablecombo</id>
diff --git a/releng/top-pom-rcp.xml b/releng/top-pom-rcp.xml
index 45a4eee1fb8..4c8b7366a07 100755
--- a/releng/top-pom-rcp.xml
+++ b/releng/top-pom-rcp.xml
@@ -102,7 +102,7 @@
<repository>
<id>nattable</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/nattable/releases/1.1.0/repository/</url>
+ <url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>
</repository>
<repository>
<id>orbit</id>
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
index 792a12f2287..96664f6d5aa 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
@@ -52,7 +52,9 @@ public class BundlesTests extends AbstractPapyrusTest {
private static final String BATIK_VERSION = "[1.6.0,1.7.0)"; //$NON-NLS-1$
- private static final String NATTABLE_VERSION = "1.1.0"; //$NON-NLS-1$
+ private static final String NATTABLE_VERSION = "1.2.0"; //$NON-NLS-1$
+
+ private static final String GLAZED_LIST_VERSION = "1.9.0";//$NON-NLS-1$
private static final String PAPYRUS_VERSION = BundleTestsUtils.PAPYRUS_VERSION;
@@ -284,6 +286,11 @@ public class BundlesTests extends AbstractPapyrusTest {
}
@Test
+ public void glazedListDependencyVersionTest() {
+ testPapyrusDependencies2("ca.odell.glazedlists", NATTABLE_VERSION);//$NON-NLS-1$
+ }
+
+ @Test
public void guavaDependencyVersionText() {
testPapyrusDependencies2("com.google.guava", "11.0.0");//$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF
index e0643f5b39a..26822379c1d 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="1.2.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF
index 98a11e9e8cf..66cf5b94ca7 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.junit,
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF
index 11c4b19023a..5819577010d 100755
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.junit;bundle-version="4.11.0",
org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
org.eclipse.papyrus.sysml;bundle-version="1.1.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF
index 8ab5a3e4606..dac4e15b18d 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
org.eclipse.papyrus.uml.nattable;bundle-version="1.1.0",
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF
index 8d5a8a7870b..a35eba6ed98 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
ca.odell.glazedlists;bundle-version="1.9.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.tools;bundle-version="1.1.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
index 8cc78aa00a9..bc1e414b583 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.junit;bundle-version="4.11.0",
org.eclipse.uml2.uml,
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
org.eclipse.emf.common,

Back to the top