Merge branch 'filtersearch' of ssh://git.eclipse.org:29418/rmf/org.eclipse.rmf into filtersearch
diff --git a/org.eclipse.rmf.reqif10.search.ui/plugin.properties b/org.eclipse.rmf.reqif10.search.ui/plugin.properties
index 62fafe9..5f64683 100644
--- a/org.eclipse.rmf.reqif10.search.ui/plugin.properties
+++ b/org.eclipse.rmf.reqif10.search.ui/plugin.properties
@@ -5,21 +5,3 @@
_UI_HorizontalOrientation_label = Horizontal orientation
_UI_VerticalOrientation_label = Vertical orientation
-
-operator_equals = =
-operator_is = =
-operator_is_not = \u2260
-operator_not_equals = \u2260
-operator_contains = contains
-operator_not_contains = contains not
-operator_regexp = regexp
-operator_regexp_plain = regexp (plain)
-operator_between = between
-operator_greater = >
-operator_smaller = <
-operator_before = before
-operator_after = after
-operator_contains_all = all
-operator_contains_any = any
-operator_is_set = set
-operator_is_not_set = not set
diff --git a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlBoolean.java b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlBoolean.java
index 53932af..8913a05 100644
--- a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlBoolean.java
+++ b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlBoolean.java
@@ -72,7 +72,7 @@
GridData layoutData = new GridData(SWT.LEFT, SWT.CENTER, false, false);
attr.setLayoutData(layoutData);
for (Operator operator : BoolFilter.SUPPORTED_OPERATORS) {
- attr.add(getString(operator.toString()));
+ attr.add(operator.toLocaleString());
}
attr.select(0);
if (templateFilter != null)
diff --git a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlDate.java b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlDate.java
index 0d47ca9..baaf7ea 100644
--- a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlDate.java
+++ b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlDate.java
@@ -77,7 +77,7 @@
GridData layoutData = new GridData(SWT.LEFT, SWT.CENTER, false, false);
attr.setLayoutData(layoutData);
for (Operator operator : DateFilter.SUPPORTED_OPERATORS) {
- attr.add(getString(operator.toString()));
+ attr.add(operator.toLocaleString());
}
attr.select(0);
if (templateFilter != null)
diff --git a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlEnum.java b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlEnum.java
index 378e716..bd12ebe 100644
--- a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlEnum.java
+++ b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlEnum.java
@@ -120,7 +120,7 @@
GridData layoutData = new GridData(SWT.LEFT, SWT.CENTER, false, false);
attr.setLayoutData(layoutData);
for (Operator operator : EnumFilter.SUPPORTED_OPERATORS) {
- attr.add(getString(operator.toString()));
+ attr.add(operator.toLocaleString());
}
attr.select(0);
if (templateFilter != null)
diff --git a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlNumber.java b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlNumber.java
index 2eaf0ee..9cb8835 100644
--- a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlNumber.java
+++ b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlNumber.java
@@ -72,7 +72,7 @@
GridData layoutData = new GridData(SWT.LEFT, SWT.CENTER, false, false);
attr.setLayoutData(layoutData);
for (Operator operator : NumberFilter.SUPPORTED_OPERATORS) {
- attr.add(getString(operator.toString()));
+ attr.add(operator.toLocaleString());
}
attr.select(0);
if (templateFilter != null)
diff --git a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlString.java b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlString.java
index babdfcc..a9e1ef4 100644
--- a/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlString.java
+++ b/org.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlString.java
@@ -97,7 +97,7 @@
GridData layoutData = new GridData(SWT.LEFT, SWT.CENTER, false, false);
attr.setLayoutData(layoutData);
for (Operator operator : operators) {
- attr.add(getString(operator.toString()));
+ attr.add(operator.toLocaleString());
}
attr.select(0);
if (templateFilter != null)
diff --git a/org.eclipse.rmf.reqif10.search/plugin.properties b/org.eclipse.rmf.reqif10.search/plugin.properties
index 3fdc055..b89d6e6 100644
--- a/org.eclipse.rmf.reqif10.search/plugin.properties
+++ b/org.eclipse.rmf.reqif10.search/plugin.properties
@@ -2,3 +2,21 @@
pluginName = ReqIF Search Model Support
providerName = Eclipse Modeling Project
+
+operator_equals = =
+operator_is = =
+operator_is_not = \u2260
+operator_not_equals = \u2260
+operator_contains = contains
+operator_not_contains = contains not
+operator_regexp = regexp
+operator_regexp_plain = regexp (plain)
+operator_between = between
+operator_greater = >
+operator_smaller = <
+operator_before = before
+operator_after = after
+operator_contains_all = all
+operator_contains_any = any
+operator_is_set = set
+operator_is_not_set = not set
\ No newline at end of file
diff --git a/org.eclipse.rmf.reqif10.search/src/org/eclipse/rmf/reqif10/search/filter/IFilter.java b/org.eclipse.rmf.reqif10.search/src/org/eclipse/rmf/reqif10/search/filter/IFilter.java
index 8777b3a..3fa61f9 100644
--- a/org.eclipse.rmf.reqif10.search/src/org/eclipse/rmf/reqif10/search/filter/IFilter.java
+++ b/org.eclipse.rmf.reqif10.search/src/org/eclipse/rmf/reqif10/search/filter/IFilter.java
@@ -12,6 +12,8 @@
******************************************************************************/
package org.eclipse.rmf.reqif10.search.filter;
+import java.util.ResourceBundle;
+
import org.eclipse.rmf.reqif10.SpecElementWithAttributes;
import org.eclipse.rmf.reqif10.pror.filter.ReqifFilter;
@@ -51,9 +53,12 @@
}
@Override
public String toString() {
- // TODO NS-Lookup
return label;
}
+
+ public String toLocaleString(){
+ return ResourceBundle.getBundle("plugin").getString(label);
+ }
}
public boolean match(SpecElementWithAttributes element);
@@ -70,5 +75,9 @@
public Object getFilterValue2();
public ImmutableSet<Operator> getSupportedOperators();
+
+
+
+
}
