Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Maintenance - Mise à jour mensuelle Lundi 6 Février entre 7h00 et 9h00
Open sidebar
Christian Pichot
AML-E-Project
Commits
4fa0e7b7
Commit
4fa0e7b7
authored
Jul 20, 2018
by
DanFaria
Browse files
Merge branch 'master' of
https://github.com/AgreementMakerLight/AML-Project.git
parents
078375a6
576fe36e
Changes
2
Hide whitespace changes
Inline
Side-by-side
AgreementMakerLight/src/aml/Main.java
View file @
4fa0e7b7
...
...
@@ -372,7 +372,7 @@ public class Main
{
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 @@ public class Main
}
}
in
.
close
();
aml
.
setMatchSteps
(
selection
);
}
catch
(
Exception
e
)
{
...
...
AgreementMakerLight/src/aml/ui/AlignmentPanel.java
View file @
4fa0e7b7
...
...
@@ -203,10 +203,10 @@ public class AlignmentPanel extends JInternalFrame implements ActionListener, It
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"
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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