Google Git
Sign in
eclipse/rcptt/org.eclipse.rcptt/natTableSupport^!/.
commit
575347ada6a7c9d443c3a0a912f2de2e24aa051c
[log]
author
Vasili Gulevich <vasili.gulevich@xored.com>
Mon Jul 16 22:37:25 2018 +0700
committer
Vasili Gulevich <vasili.gulevich@xored.com>
Mon Jul 16 22:37:25 2018 +0700
tree
2f658698beab1136e5dacf0a80a51c9492976db6
parent
5be35902e3f07e6603e22fbfa3e277db92a764b6 [diff]
Fixed merge-induced compilation errors

diff --git a/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/feature.xml b/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/feature.xml
index 6a1f0b8..6d5f3d2 100644
--- a/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/feature.xml
+++ b/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/feature.xml

@@ -39,14 +39,14 @@
          id="org.eclipse.rcptt.tesla.nebula.ecl"
          download-size="0"
          install-size="0"
-         version="2.1.0.qualifier"
+         version="2.4.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.nebula.ecl.impl"
          download-size="0"
          install-size="0"
-         version="2.1.0.qualifier"
+         version="2.4.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -74,7 +74,7 @@
          id="org.eclipse.rcptt.tesla.nebula.nattable.impl"
          download-size="0"
          install-size="0"
-         version="2.1.0.qualifier"
+         version="2.4.0.qualifier"
          unpack="false"/>
          
    <plugin
@@ -88,14 +88,14 @@
          id="org.eclipse.rcptt.tesla.recording.nebula.ecl"
          download-size="0"
          install-size="0"
-         version="2.1.0.qualifier"
+         version="2.4.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.nebula.nattable"
          download-size="0"
          install-size="0"
-         version="2.1.0.qualifier"
+         version="2.4.0.qualifier"
          unpack="false"/>
 
 </feature>

diff --git a/modules/nebula/features/org.eclipse.rcptt.module.nebula/feature.xml b/modules/nebula/features/org.eclipse.rcptt.module.nebula/feature.xml
index f3ed7cc..6e3a130 100644
--- a/modules/nebula/features/org.eclipse.rcptt.module.nebula/feature.xml
+++ b/modules/nebula/features/org.eclipse.rcptt.module.nebula/feature.xml

@@ -53,7 +53,7 @@
          id="org.eclipse.rcptt.tesla.nebula.nattable.ecl"
          download-size="0"
          install-size="0"
-         version="2.1.0.qualifier"
+         version="2.4.0.qualifier"
          unpack="false"/>
 
    <plugin

diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl.impl/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl.impl/META-INF/MANIFEST.MF
index b5f04d4..04a587c 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl.impl/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl.impl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime ECL Implementation for Nebula (Incubation)
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.nebula.nattable.ecl.impl;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rcptt.tesla.ecl,

diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl.impl/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl.impl/pom.xml
index 863ea47..fc498d9 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl.impl/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl.impl/pom.xml

@@ -4,12 +4,10 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <groupId>org.eclipse.rcptt</groupId>
   <artifactId>org.eclipse.rcptt.tesla.nebula.nattable.ecl.impl</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl/META-INF/MANIFEST.MF
index 20d9996..8410add 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.nebula.nattable.ecl;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin

diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl/pom.xml
index 9e0ce72..6535e2b 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl/pom.xml

@@ -4,12 +4,10 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <groupId>org.eclipse.rcptt</groupId>
   <artifactId>org.eclipse.rcptt.tesla.nebula.nattable.ecl</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl/META-INF/MANIFEST.MF
index 060ce2c..f1c0cec 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Nebula NatTable Implementation (Incubation)
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.nebula.nattable.impl;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,

diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl/pom.xml
index 651a121..cf3b932 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl/pom.xml

@@ -4,12 +4,11 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>org.eclipse.rcptt</groupId>
   <artifactId>org.eclipse.rcptt.tesla.nebula.nattable.impl</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl/src/org/eclipse/rcptt/tesla/nebula/nattable/processors/NatTableProcessor.java b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl/src/org/eclipse/rcptt/tesla/nebula/nattable/processors/NatTableProcessor.java
index 2b3577d..a791014 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl/src/org/eclipse/rcptt/tesla/nebula/nattable/processors/NatTableProcessor.java
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl/src/org/eclipse/rcptt/tesla/nebula/nattable/processors/NatTableProcessor.java

@@ -234,4 +234,9 @@
 		response.setMessage(msg);
 		return response;
 	}
+
+	@Override
+	public int getPriority() {
+		return 400;
+	}
 }

diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.nattable/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.nattable/META-INF/MANIFEST.MF
index 962ef2e..6d24e70 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.nattable/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.nattable/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Recording Nebula Support (Incubation)
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.nebula.nattable;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,

diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.nattable/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.nattable/pom.xml
index e1f1b11..3a62fea 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.nattable/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.nattable/pom.xml

@@ -4,12 +4,10 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <groupId>org.eclipse.rcptt</groupId>
   <artifactId>org.eclipse.rcptt.tesla.recording.nebula.nattable</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

diff --git a/modules/nebula/pom.xml b/modules/nebula/pom.xml
index fd64b7d..0891851 100644
--- a/modules/nebula/pom.xml
+++ b/modules/nebula/pom.xml

@@ -13,9 +13,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.rcptt</groupId>
   <artifactId>rcptt-module-nebula</artifactId>
-  <version>2.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <parent>
@@ -60,14 +58,14 @@
     <module>plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl</module>
     <module>plugins/org.eclipse.rcptt.tesla.recording.nebula</module>
     <module>plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl</module>
-    <module>features/org.eclipse.rcptt.module.nebula.runtime</module>
-    <module>runtime-site</module>
     <module>plugins/org.eclipse.rcptt.module.nebula.updates</module>
-    <module>features/org.eclipse.rcptt.module.nebula</module>
     <module>plugins/org.eclipse.rcptt.tesla.nebula.nattable.impl</module>
     <module>plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl</module>
     <module>plugins/org.eclipse.rcptt.tesla.nebula.nattable.ecl.impl</module>
     <module>plugins/org.eclipse.rcptt.tesla.recording.nebula.nattable</module>
+    <module>runtime-site</module>
+    <module>features/org.eclipse.rcptt.module.nebula.runtime</module>
+    <module>features/org.eclipse.rcptt.module.nebula</module>
     <module>site</module>
   </modules>
 </project>

diff --git a/releng/target-platforms/photon/ide.target b/releng/target-platforms/photon/ide.target
index ca0d347..51a3782 100644
--- a/releng/target-platforms/photon/ide.target
+++ b/releng/target-platforms/photon/ide.target

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target includeMode="feature" name="photon" sequenceNumber="90">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target includeMode="feature" name="photon" sequenceNumber="91">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
@@ -12,6 +12,10 @@
 <repository location="http://download.eclipse.org/nebula/snapshot/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
+<repository location="http://download.eclipse.org/nattable/releases/1.5.0/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.rcptt.updates.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/rcptt/nightly/2.4.0/latest/repository"/>
 </location>

diff --git a/runtime/updates/org.eclipse.rcptt.updates-feature/feature.xml b/runtime/updates/org.eclipse.rcptt.updates-feature/feature.xml
index 42a43c4..e8d00c0 100644
--- a/runtime/updates/org.eclipse.rcptt.updates-feature/feature.xml
+++ b/runtime/updates/org.eclipse.rcptt.updates-feature/feature.xml

@@ -99,6 +99,6 @@
          id="org.eclipse.rcptt.module.nebula.updates"
          download-size="0"
          install-size="0"
-         version="2.1.0.qualifier"
+         version="2.4.0.qualifier"
          unpack="false"/>
 </feature>