Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Dr. Michael Petter
CUP Eclipse Plugin
Commits
dd6a0bab
Commit
dd6a0bab
authored
Jan 21, 2016
by
Michael Schwarz
🤔
Browse files
Gray background for unrelated conflicts, resolution button removed for
RR
parent
13b5659f
Changes
2
Hide whitespace changes
Inline
Side-by-side
CupPlugin/src/de/tum/in/www2/cupplugin/Colors.java
View file @
dd6a0bab
...
...
@@ -21,7 +21,6 @@ public class Colors {
public
static
final
RGB
stateGreen
=
new
RGB
(
146
,
203
,
135
);
public
static
final
RGB
stateBlue
=
new
RGB
(
196
,
232
,
230
);
public
static
final
RGB
stateRed
=
new
RGB
(
232
,
196
,
196
);
public
static
final
RGB
stateYellow
=
new
RGB
(
218
,
214
,
155
);
...
...
@@ -33,6 +32,6 @@ public class Colors {
public
static
final
RGB
conflictFgYellow
=
new
RGB
(
91
,
71
,
17
);
public
static
final
RGB
conflictBgRed
=
new
RGB
(
255
,
198
,
198
);
public
static
final
RGB
conflictFgRed
=
new
RGB
(
255
,
0
,
0
);
public
static
final
RGB
conflictBgGray
=
new
RGB
(
232
,
232
,
232
);
public
static
final
RGB
conflictFgGray
=
new
RGB
(
114
,
114
,
114
);
}
CupPlugin/src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
View file @
dd6a0bab
...
...
@@ -135,8 +135,8 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
private
Color
backgroundColorShiftReduceAffected
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictBgRed
);
private
Color
foregroundColorShiftReduceAffected
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictFgRed
);
private
Color
backgroundColorShiftReduceUnrelated
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictBg
Yellow
);
private
Color
foregroundColorShiftReduceUnrelated
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictFg
Yellow
);
private
Color
backgroundColorShiftReduceUnrelated
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictBg
Gray
);
private
Color
foregroundColorShiftReduceUnrelated
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictFg
Gray
);
GridData
gridData
;
...
...
@@ -286,6 +286,9 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
changeColors
(
backgroundColorReduceReduce
,
foregroundColorReduceReduce
);
conflictTypeLabel
.
setText
(
"Reduce-Reduce conflict"
);
resolutionOptions
.
setVisible
(
false
);
resolutionButton
.
setVisible
(
false
);
ProductionRight
conflict1Ast
=
rrc
.
getConflictItem1
()
.
the_production
().
getAstNode
();
...
...
@@ -342,8 +345,12 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
ShiftReduceConflict
src
=
(
ShiftReduceConflict
)
conflict
;
changeColors
(
backgroundColorShiftReduce
,
foregroundColorShiftReduce
);
resolutionOptions
.
setVisible
(
true
);
resolutionButton
.
setVisible
(
true
);
conflictTypeLabel
.
setText
(
"Shift-Reduce conflict"
);
symbolLabel
.
setText
(
"Under symbol: "
+
src
.
getTerminal
().
name
());
ProductionRight
conflict1Ast
=
src
.
getConflictItem1
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment