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
f314f1e1
Commit
f314f1e1
authored
Feb 23, 2016
by
Michael Schwarz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ReduceReduce reorder working
parent
16caeb32
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
CupPlugin/src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
.../src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
+5
-1
CupPlugin/src/de/tum/in/www2/cupplugin/views/ReordersToDo.java
...ugin/src/de/tum/in/www2/cupplugin/views/ReordersToDo.java
+1
-1
No files found.
CupPlugin/src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
View file @
f314f1e1
...
...
@@ -4,6 +4,7 @@ import java.io.IOException;
import
java.util.ArrayList
;
import
java.util.EnumSet
;
import
java.util.HashMap
;
import
java.util.LinkedList
;
import
java.util.List
;
import
javax.xml.parsers.ParserConfigurationException
;
...
...
@@ -37,6 +38,8 @@ import org.eclipse.swt.widgets.Shell;
import
org.eclipse.ui.IFileEditorInput
;
import
org.xml.sax.SAXException
;
import
com.sun.xml.internal.ws.policy.privateutil.PolicyUtils.Collections
;
import
de.in.tum.www2.cup.Conflict
;
import
de.in.tum.www2.cup.ConflictResolutionManager
;
import
de.in.tum.www2.cup.LALRResult
;
...
...
@@ -563,7 +566,8 @@ public class CupConflictsView extends FailableView
private
void
applyConnectedResolutionRR
()
{
try
{
ReordersToDo
rtd
=
(
ReordersToDo
)
currentResolution
;
List
<
lr_item_core
>
order
=
rtd
.
getItemsOrdered
();
LinkedList
<
lr_item_core
>
order
=
rtd
.
getItemsOrdered
();
java
.
util
.
Collections
.
reverse
(
order
);
ReduceReduceReorder
rrr
=
new
ReduceReduceReorder
(
editor
.
getDocument
(),
isThresholdPresent
());
for
(
lr_item_core
item
:
order
){
...
...
CupPlugin/src/de/tum/in/www2/cupplugin/views/ReordersToDo.java
View file @
f314f1e1
...
...
@@ -185,7 +185,7 @@ public class ReordersToDo extends GraphHelper<lr_item_core> implements Resolutio
}
}
public
List
<
lr_item_core
>
getItemsOrdered
()
throws
OrderCyclicException
{
public
Li
nkedLi
st
<
lr_item_core
>
getItemsOrdered
()
throws
OrderCyclicException
{
if
(!
isAcyclic
()){
throw
new
OrderCyclicException
(
""
,
cycle
);
}
...
...
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