commit fa7d9cb828770b95d21d5c71220147f0108181cb
Author: Mauro Talevi <[email protected]>
AuthorDate: Mon Jul 9 19:45:35 2012 +0200
Commit: Mauro Talevi <[email protected]>
CommitDate: Mon Jul 9 19:45:35 2012 +0200
JBEHAVE-233: Changed warning icon and fatal error colour theme.
diff --git
a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/MarkingStoryValidator.java
b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/MarkingStoryValidator.java
index 287ce51..865c47a 100644
---
a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/MarkingStoryValidator.java
+++
b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/MarkingStoryValidator.java
@@ -249,14 +249,14 @@ public class MarkingStoryValidator {
int count = candidates.size();
log.debug("#" + count + "result(s) found for >>" +
Strings.escapeNL(key) + "<<");
if (count == 0)
- part.addErrorMark(Marks.Code.NoMatchingStep, "No step is
matching <" + key + ">");
+ part.addWarningMark(Marks.Code.NoMatchingStep, "No step is
matching <" + key + ">");
else if (count > 1) {
fj.data.List<Integer> collectedPrios =
iterableList(candidates).map(new TransformByPriority());
int max = collectedPrios.maximum(Ord.intOrd);
int countWithMax =
collectedPrios.filter(Equal.intEqual.eq(max)).length();
if (countWithMax>1) {
- MarkData mark =
part.addErrorMark(Marks.Code.MultipleMatchingSteps, "Ambiguous step: " + count
+ " steps are matching <" + key + "> got: " + candidates);
+ MarkData mark =
part.addWarningMark(Marks.Code.MultipleMatchingSteps, "Ambiguous step: " +
count + " steps are matching <" + key + "> got: " + candidates);
Marks.putStepsAsHtml(mark, candidates);
}
else {
@@ -329,6 +329,10 @@ public class MarkingStoryValidator {
return addMark(code, message, IMarker.SEVERITY_INFO);
}
+ public MarkData addWarningMark(Marks.Code code, String message) {
+ return addMark(code, message, IMarker.SEVERITY_WARNING);
+ }
+
public MarkData addMark(Marks.Code code, String message, int severity)
{
MarkData markData = new MarkData()//
.severity(severity)//
diff --git
a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/text/style/TextStyleTheme.java
b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/text/style/TextStyleTheme.java
index a98cc8b..d779cd4 100644
---
a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/text/style/TextStyleTheme.java
+++
b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/text/style/TextStyleTheme.java
@@ -38,7 +38,7 @@ public class TextStyleTheme {
root.setCurrentLineHighlight(new RGB(247,225,203));
Map<String,TextStyle> map = root.createMap();
define(map, DEFAULT, new RGB(255,255,255),new RGB(0,0,0),false,false);
- define(map, ERROR, new RGB(255,0,0),new RGB(0,0,0),true,false);
+ define(map, ERROR, new RGB(255,255,255), new RGB(255,0,0),true,false);
define(map, NARRATIVE_DEFAULT, null,new RGB(183,57,20),true,false);
define(map, NARRATIVE_KEYWORD, null,null,false,true);
define(map, COMMENT, null,new RGB(62,165,0),false,false);