Merge branch 'master' of https://github.com/AgreementMakerLight/AML-Project.git

DanFaria · DanFaria · commit 4fa0e7b762df · 2018-07-20T10:10:54.000+01:00
diff --git a/AgreementMakerLight/src/aml/Main.java b/AgreementMakerLight/src/aml/Main.java
@@ -372,7 +372,7 @@ else if(option[0].equals("selection_type"))
 				{
 					if(option[1].equalsIgnoreCase("none"))
 						continue;
-					selection.add(MatchStep.PROPERTY);
+					selection.add(MatchStep.SELECT);
 					if(!option[1].equalsIgnoreCase("auto"))
 						aml.setSelectionType(SelectionType.parseSelector(option[1]));
 				}
@@ -383,6 +383,7 @@ else if(option[0].equals("repair_alignment"))
 				}
 			}
 			in.close();
+			aml.setMatchSteps(selection);
 		}
 		catch(Exception e)
 		{
diff --git a/AgreementMakerLight/src/aml/ui/AlignmentPanel.java b/AgreementMakerLight/src/aml/ui/AlignmentPanel.java
@@ -203,10 +203,10 @@ public void refresh()
 			setIncorrect.setBackground(AMLColor.RED);
 			setIncorrect.setPreferredSize(new Dimension(110,28));
 			setIncorrect.addActionListener(this);
-			sortAsc = new JButton("Sort ↑");
+			sortAsc = new JButton("Sort \u2191");
 			sortAsc.setPreferredSize(new Dimension(110,28));
 			sortAsc.addActionListener(this);
-			sortDes = new JButton("Sort ↓");
+			sortDes = new JButton("Sort \u2193");
 			sortDes.setPreferredSize(new Dimension(110,28));
 			sortDes.addActionListener(this);
 			search = new JButton("Search");

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ else if(option[0].equals("selection_type"))`
`372`	`372`	`{`
`373`	`373`	`if(option[1].equalsIgnoreCase("none"))`
`374`	`374`	`continue;`
`375`		`- selection.add(MatchStep.PROPERTY);`
	`375`	`+ selection.add(MatchStep.SELECT);`
`376`	`376`	`if(!option[1].equalsIgnoreCase("auto"))`
`377`	`377`	`aml.setSelectionType(SelectionType.parseSelector(option[1]));`
`378`	`378`	`}`
`@@ -383,6 +383,7 @@ else if(option[0].equals("repair_alignment"))`
`383`	`383`	`}`
`384`	`384`	`}`
`385`	`385`	`in.close();`
	`386`	`+ aml.setMatchSteps(selection);`
`386`	`387`	`}`
`387`	`388`	`catch(Exception e)`
`388`	`389`	`{`