Commit f5a86b5f authored by Michael Schwarz's avatar Michael Schwarz

moved buildfile update

parent 599d462e
package de.tum.in.www2.cupplugin.views; package de.tum.in.www2.cupplugin.conflictresolution;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
......
...@@ -47,6 +47,7 @@ import de.in.tum.www2.cup.internal.internal_error; ...@@ -47,6 +47,7 @@ import de.in.tum.www2.cup.internal.internal_error;
import de.in.tum.www2.cup.internal.lr_item_core; import de.in.tum.www2.cup.internal.lr_item_core;
import de.in.tum.www2.cup.internal.terminal; import de.in.tum.www2.cup.internal.terminal;
import de.tum.in.www2.cupplugin.Colors; import de.tum.in.www2.cupplugin.Colors;
import de.tum.in.www2.cupplugin.conflictresolution.BuildfileUpdater;
import de.tum.in.www2.cupplugin.conflictresolution.ConflictFilter; import de.tum.in.www2.cupplugin.conflictresolution.ConflictFilter;
import de.tum.in.www2.cupplugin.conflictresolution.PrecedenceToInsert; import de.tum.in.www2.cupplugin.conflictresolution.PrecedenceToInsert;
import de.tum.in.www2.cupplugin.conflictresolution.PrecedenceToInsert.PrecedenceCyclicException; import de.tum.in.www2.cupplugin.conflictresolution.PrecedenceToInsert.PrecedenceCyclicException;
...@@ -239,7 +240,7 @@ public class CupConflictsView extends FailableView ...@@ -239,7 +240,7 @@ public class CupConflictsView extends FailableView
} }
// Do this less often // Do this less often
// updateBuildfile(ignored); updateBuildfile(cf.getResolvedCountLastRun());
scrolled.setLayoutDeferred(true); scrolled.setLayoutDeferred(true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment