Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CUP Eclipse Plugin
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Schwarz
CUP Eclipse Plugin
Commits
16caeb32
Commit
16caeb32
authored
Feb 23, 2016
by
Michael Schwarz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RR resolution
parent
092de795
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
4 deletions
+24
-4
CupPlugin/src/de/tum/in/www2/cupplugin/views/ConflictPanel.java
...gin/src/de/tum/in/www2/cupplugin/views/ConflictPanel.java
+5
-3
CupPlugin/src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
.../src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
+19
-1
No files found.
CupPlugin/src/de/tum/in/www2/cupplugin/views/ConflictPanel.java
View file @
16caeb32
...
...
@@ -69,9 +69,11 @@ class ConflictPanel extends Composite {
private
Color
backgroundColorReduceReduce
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictBgBlue
);
private
Color
foregroundColorReduceReduce
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictFgBlue
);
private
Color
backgroundColorShiftReduce
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictBgYellow
);
private
Color
foregroundColorShiftReduce
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictFgYellow
);
private
Color
foregroundColorShiftReduce
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictFgYellow
);
private
Color
backgroundColorAffected
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictBgRed
);
private
Color
foregroundColorAffected
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictFgRed
);
private
Color
foregroundColorAffected
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictFgRed
);
private
Color
backgroundColorUnrelated
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictBgGray
);
private
Color
foregroundColorUnrelated
=
new
Color
(
Display
.
getCurrent
(),
Colors
.
conflictFgGray
);
...
...
@@ -779,7 +781,7 @@ class ConflictPanel extends Composite {
}
}
if
(
resolutionOptions
.
getSelectionIndex
()
==
2
){
// Reduce
if
(
resolutionOptions
.
getSelectionIndex
()
==
2
){
// Reduce
with 2
try
{
cupConflictsView
.
setOrder
(
item2
,
item1
);
}
catch
(
OrderCyclicException
e1
)
{
...
...
CupPlugin/src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
View file @
16caeb32
...
...
@@ -560,7 +560,25 @@ public class CupConflictsView extends FailableView
}
}
private
void
applyConnectedResolutionRR
(){
private
void
applyConnectedResolutionRR
()
{
try
{
ReordersToDo
rtd
=
(
ReordersToDo
)
currentResolution
;
List
<
lr_item_core
>
order
=
rtd
.
getItemsOrdered
();
ReduceReduceReorder
rrr
=
new
ReduceReduceReorder
(
editor
.
getDocument
(),
isThresholdPresent
());
for
(
lr_item_core
item
:
order
){
rrr
.
moveItemToVeryEnd
(
item
);
}
rrr
.
apply
();
}
catch
(
OrderCyclicException
e
)
{
// TODO Auto-generated catch block
e
.
printStackTrace
();
}
catch
(
BadLocationException
e
)
{
// TODO Auto-generated catch block
e
.
printStackTrace
();
}
}
...
...
Write
Preview
Markdown
is supported
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