Merge branch 'filtersearch' of ssh://git.eclipse.org:29418/rmf/org.eclipse.rmf into filtersearch
diff --git a/org.eclipse.rmf.releng/pom.xml b/org.eclipse.rmf.releng/pom.xml
index 27209e8..4343e03 100644
--- a/org.eclipse.rmf.releng/pom.xml
+++ b/org.eclipse.rmf.releng/pom.xml
@@ -91,6 +91,7 @@
<module>../org.eclipse.rmf.reqif10.search</module>
<module>../org.eclipse.rmf.reqif10.search.edit</module>
<module>../org.eclipse.rmf.reqif10.search.ui</module>
+ <module>../org.eclipse.rmf.reqif10.search.test</module>
<module>../org.eclipse.rmf.reqif10.pror.genhtml</module>
<module>../org.eclipse.rmf.reqif10.csv.importer</module>
<module>../org.eclipse.rmf.reqif10.pror.feature</module>
diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellRenderer.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellRenderer.java
index c516953..163d1ea 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellRenderer.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellRenderer.java
@@ -49,6 +49,7 @@
/**
* @author Lukas Ladenberger
* @author Ingo Weigelt
+ * @author Michael Jastram
*/
public class AbstractProrCellRenderer extends TextCellRenderer {
@@ -160,6 +161,8 @@
protected void initialColor(int row, int col) {
if (agileGrid.isCellSelected(row, col)) {
background = SWTResourceManager.getColor(223, 227, 237);
+ } else {
+ background = SWTResourceManager.getColor(SWT.COLOR_WHITE);
}
}
diff --git a/org.eclipse.rmf.reqif10.search.test/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.search.test/META-INF/MANIFEST.MF
index 57f140a..f6e4649 100644
--- a/org.eclipse.rmf.reqif10.search.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.search.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Fragment-Host: org.eclipse.rmf.reqif10.search
Bundle-Name: Tests for Search
Bundle-SymbolicName: org.eclipse.rmf.reqif10.search.test
-Bundle-Version: 0.23.0.qualifier
+Bundle-Version: 0.12.0.qualifier
Export-Package: org.eclipse.rmf.reqif10.search.test,
org.eclipse.rmf.reqif10.search.testdata
Bundle-Vendor: Formal Mind GmbH
diff --git a/org.eclipse.rmf.reqif10.search.test/build.properties b/org.eclipse.rmf.reqif10.search.test/build.properties
index ab59e59..b107977 100644
--- a/org.eclipse.rmf.reqif10.search.test/build.properties
+++ b/org.eclipse.rmf.reqif10.search.test/build.properties
@@ -1,4 +1,3 @@
source.. = src/
bin.includes = META-INF/,\
- .,\
- fragment.xml
+ .
diff --git a/org.eclipse.rmf.reqif10.search.test/fragment.xml b/org.eclipse.rmf.reqif10.search.test/fragment.xml
deleted file mode 100644
index 33d83fc..0000000
--- a/org.eclipse.rmf.reqif10.search.test/fragment.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<fragment>
-</fragment>
diff --git a/org.eclipse.rmf.reqif10.search.test/pom.xml b/org.eclipse.rmf.reqif10.search.test/pom.xml
new file mode 100644
index 0000000..2d137f4
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.search.test/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.rmf</groupId>
+ <artifactId>org.eclipse.rmf.releng</artifactId>
+ <version>0.12.0-SNAPSHOT</version>
+ <relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
+ </parent>
+ <groupId>org.eclipse.rmf.plugins</groupId>
+ <artifactId>org.eclipse.rmf.reqif10.search.test</artifactId>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <packaging>eclipse-test-plugin</packaging>
+ <profiles>
+ <profile>
+ <id>macosx</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <test.vmargs>-Xmx512m -XX:MaxPermSize=256m -XstartOnFirstThread</test.vmargs>
+ </properties>
+ </profile>
+ <profile>
+ <id>other-os</id>
+ <activation>
+ <os>
+ <family>!mac</family>
+ </os>
+ </activation>
+ <properties>
+ <test.vmargs>-Xmx512m -XX:MaxPermSize=256m</test.vmargs>
+ </properties>
+ </profile>
+ </profiles>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <includes>
+ <include>**/*Test.class</include>
+ </includes>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <argLine>${test.vmargs}</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${antrun.version}</version>
+ <executions>
+ <execution>
+ <id>generate-commit-id</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <target>
+ <mkdir dir="${project.build.outputDirectory}"/>
+ <touch file = "${project.build.outputDirectory}/commit-id" />
+ <exec executable="git" output="${project.build.outputDirectory}/commit-id">
+ <arg value="rev-parse" />
+ <arg value="HEAD" />
+ </exec>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
