++
This commit is contained in:
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
|
||||
|
||||
import java.util.Vector;
|
||||
public class Constants {
|
||||
public static final int version = 1264;
|
||||
public static final int version = 1265;
|
||||
public static final int planner_version = 24;
|
||||
public static final int testingMaxKernels = 64;
|
||||
//--
|
||||
|
||||
@@ -3,10 +3,10 @@ import _VisualDVM.Global;
|
||||
import _VisualDVM.Visual.Menus.PropertiesSubmenu;
|
||||
public class VersionsComparisonMenu extends PropertiesSubmenu {
|
||||
public VersionsComparisonMenu() {
|
||||
super("Сравнение версий", null,
|
||||
super("Сравнение текстов", null,
|
||||
Global.normalProperties,
|
||||
// "RegisterOn",
|
||||
// "SpacesOn",
|
||||
"SpacesOn",
|
||||
// "EmptyLinesOn",
|
||||
// "FortranWrapsOn",
|
||||
"ExtensionsOn",
|
||||
|
||||
@@ -8,6 +8,7 @@ import Common.Visual.Controls.ShortLabel;
|
||||
import Common.Visual.Editor.BaseEditor;
|
||||
import Common.Visual.Menus.VisualiserMenuBar;
|
||||
import Common.Visual.UI;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
|
||||
import _VisualDVM.Utils;
|
||||
import com.github.difflib.text.DiffRow;
|
||||
@@ -185,7 +186,7 @@ public abstract class ComparisonForm<T> {
|
||||
DiffRowGenerator generator = DiffRowGenerator.create()
|
||||
.showInlineDiffs(true)
|
||||
.inlineDiffByWord(true)
|
||||
// .ignoreWhiteSpaces(false)
|
||||
.ignoreWhiteSpaces(!Global.normalProperties.SpacesOn)
|
||||
.oldTag(f -> separator)
|
||||
.newTag(f -> separator)
|
||||
.build();
|
||||
|
||||
Reference in New Issue
Block a user