repo.or.cz
/
EMFCompare2.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[572074] Constraint gmf.runtime range for Sirius integration
2022-09-05
Arthur Daussy
[572
0
74
]
Constrai
n
t
gmf
.
runtime ran
g
e f
o
r
Sirius in
t
egration
commit
|
commitdiff
|
tree
2018-06-04
Arthu
r
D
a
u
ssy
[534365
]
Fix Recurs
i
veMo
d
elMer
g
er for "binary" git
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
A
rthur Daus
s
y
Do not ha
n
dle "merged" f
i
l
e
s twi
c
e when JGit
s
tages
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Ar
t
hur
D
auss
y
[535200] Cr
e
ate
a
new T
r
ee
W
alk
inste
a
d
reus
i
n
g
o
n
e
commit
|
commitdiff
|
tree
2018-04-12
Arthur Dauss
y
I
c
o
n
f
o
lder shoul
d
be in
c
lud
e
d in the
build (Egit
.
ui)
commit
|
commitdiff
|
tree
2018-04-12
Arthur
Daussy
[53
3
486]
Imp
r
ov
e
c
onte
n
t type hand
l
i
n
g by
EMF C
o
mpare
commit
|
commitdiff
|
tree
2018-04-11
Arthur Daus
s
y
[533467] Fixes
"
r
equire" linking pro
c
ess in Si
r
iusDiffPostPr
.
.
.
commit
|
commitdiff
|
tree
2018-01-24
Art
h
ur Dauss
y
[530250] Fix R
e
c
ursiveModelMerge
r
to be a
b
le t
o
handle
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2018-01-05
Arthur Daussy
[529438]
M
anually
d
ispo
s
e DropDownMergeMenuAction
when
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2017-12-26
Arthur D
a
u
s
sy
[529212] Di
s
pose EM
F
CompareCo
l
or
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
Arthur Daussy
Add
s
unit test for enum
commit
|
commitdiff
|
tree
2014-12-16
Arthur Daus
s
y
Adds new no
d
e types in the "Nodes" me
t
a
m
odel
to test
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Ar
t
h
ur Daussy
Merge "[EMF Compare CLI] A
d
d
git logicalpull section
.
.
.
commit
|
commitdiff
|
tree
2014-12-03
Arthur Daussy
[EMF Com
p
are CLI] Documentation
of the
'logicalr
e
b
a
s
e
.
.
.
commit
|
commitdiff
|
tree
2014-12-01
Arth
u
r D
a
ussy
Corrects an er
r
or in the 'logicalcherry-pi
c
k'documenta
t
io
n
.
commit
|
commitdiff
|
tree
2014-12-01
Art
h
ur Daussy
[
E
MF Compag
e
CLI] Adds a "Know
n
i
s
sues" secti
o
n
.
commit
|
commitdiff
|
tree
2014-12-01
A
r
thur Daussy
[E
M
F Compare CL
I
]
D
o
cu
m
entation of
the 'lo
g
icalch
e
rry
.
.
.
commit
|
commitdiff
|
tree
2014-11-05
Arthur
D
aus
s
y
UI
t
ests: Update differences
order
commit
|
commitdiff
|
tree
2014-11-05
Art
h
ur Daussy
UI
tests:
Update edito
r
label after
m
odification in
.
.
.
commit
|
commitdiff
|
tree
2014-11-03
A
rthur Daussy
Configu
r
es Q
7
test
s
t
o run
o
n Mars platf
o
rm
commit
|
commitdiff
|
tree
2014-10-23
Arthur Daussy
Fixes org
.
e
c
l
i
pse
.
emf
.
compa
r
e
.
diagram
.
ide
.
ui
.
papy
r
us
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Arthu
r
Daussy
Un
l
oads
U
M
L reso
u
rces th
a
n
k
s to t
h
e res
o
urce set hook
s
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Arthu
r
D
a
u
ssy
P
r
ev
e
nts scope t
o
fi
l
ter re
s
ource
s
using pathmap
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daussy
Adds
o
nDispose method o
n
t
h
e
resource
s
et
hooks
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daus
s
y
Corrects label
s
after enhancement o
n
conflicts la
b
el
.
commit
|
commitdiff
|
tree
2014-10-14
Arthu
r
Daussy
[
3
9
8
367] Adds Papyrus
CSS cus
t
omization supp
o
rt
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur D
a
ussy
Adds ResourceS
e
tHook extension point
.
commit
|
commitdiff
|
tree
2014-10-14
A
rth
u
r Daussy
Prevents loading twice
t
he same mod
e
l in a NotLoadi
n
gResourc
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-13
Arthur Daussy
[443
3
37] Prevent large sha
p
es ic
o
ns
for s
t
ereoty
p
es
.
commit
|
commitdiff
|
tree
2014-10-13
A
r
thur Daussy
[446
4
13] StructureMe
r
geViewer shoul
d
rebuild
it
s
tree
.
.
.
commit
|
commitdiff
|
tree
2014-10-09
Arthur Daussy
U
p
dates Q7
t
ests configuration
.
commit
|
commitdiff
|
tree
2014-10-09
Arthur Daussy
C
o
rrect
s
G
i
t label
commit
|
commitdiff
|
tree
2014-10-08
Arth
u
r
Daussy
Co
r
rects typo on lo
g
ical model mini
m
izer
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-08
Arthur
Dau
s
sy
Ad
d
s tes
t
s to load UML profile
in No
t
L
o
ad
i
ngResourceSet
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-08
Arthu
r
Daussy
[444978] Preven
t
s
duplicat
e
d IS
t
o
ra
g
e when
creating
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-29
Arthur Daussy
EG
i
t
behavior ch
a
nge
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
A
r
thur D
a
ussy
[44
3
420]
H
andle not i
n
tegra
t
e
d
dynamic profi
l
e
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
A
rthur Daussy
[441089]
N
agivatio
n
between d
i
fferen
c
es
n
ow uses an
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
Arthur
Daus
s
y
[4
4
333
0
] Lo
a
d
UML sta
t
ic profile using
path
m
ap
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
A
r
thur Daussy
[44333
0
] Av
o
id getting a "Profile versi
o
n change" error
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
Arthur Da
u
ssy
[443330] Impro
v
es URI
h
andling
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-27
A
rthur Daus
s
y
[442355
]
Corrects la
b
el on "ReplaceWith" dialog
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-25
Arthur
Dau
s
sy
Updates editor
labels due to EGit behavior change
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-22
Arthur Daussy
Up
d
a
t
es preferenc
e
s
U
I tests to adapt to new
content
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-22
Arth
u
r Daussy
Corr
e
cts renaming problem
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-21
Arthur Daussy
UI improv
e
ment: Correction of an error
o
n the removal
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-19
Arthu
r
Daussy
UI improvement:
P
revents f
r
eez
i
ng
U
I
during g
r
oups
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-19
Arthur Daussy
It
e
m
pr
o
vid
e
rs
preferen
c
e
p
age
documentation
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-19
Ar
t
hur
Daussy
[43
4
62
1
] Co
r
rect
i
o
n o
n
RootID
M
atching strategy
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-14
Arthur
D
aussy
[
4
41437] Corr
e
cts an er
r
or in the developper guide
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-01
A
r
thur Daus
s
y
C
orr
e
ct
s
p
o
ssible NPE
on resource resolving
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-18
Arthur
D
a
u
s
s
y
U
pdates
e
xternal adapter
factories
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-18
Arthur Daussy
Add
s
Item
provider prefer
e
n
c
e page
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-18
Arthur Daussy
T
u
torial
p
art 2 : Git
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-17
Arthu
r
Daussy
Fi
l
ters EMF compar
e
adapter factories us
i
n
g prefere
n
c
es
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur
Daussy
Correction of 2
checkstyle errors
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur D
a
ussy
Co
r
rection of unit tests for
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
A
rthur Dau
s
sy
U
s
e stateful item pr
o
vi
d
e
r
s for
Diagra
m
ext
e
nsions
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur Da
u
ssy
Regenates
.
edit code for Diag
r
amCompare
m
etam
o
del with
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur Daussy
Test integration of p
r
ofiles in EMF Compare
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Ar
t
hur
D
aussy
Customizes the way StereotypeAttributeChange and Stereotype
R
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur Daussy
Use statefu
l
i
t
em
providers for
U
M
L extensions
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur Da
u
ss
y
Uni
t
tests f
o
r DecoratorUMLProfileI
t
emProv
i
de
r
Adap
t
erFac
t
o
ry
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur
D
aussy
A
d
ds custom stereotypes
icons
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
A
rthur Daussy
Cutomization of the way stereotype
d
elements a
r
e
d
i
s
played
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-26
Arthur Daussy
S
t
ereotype
d
ElementChang
e
PostProcessor
u
nit tests
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-26
Ar
t
hur Daussy
Rege
n
erates
EMF Compa
r
e st
a
tic test
p
rofile
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-26
Ar
t
hur Daussy
Adds UMLStereotypedElementChang
e
post
p
r
o
cesso
r
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-23
Arthur D
a
u
s
sy
Add S
t
er
e
otyped elem
e
nt cha
n
ge to the UML Com
p
ar
e
meta
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Art
h
ur Dau
s
sy
Generates UMLC
o
m
p
are source
code with EMF 2
.
10
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Arthur Daussy
Unit test for MDT Papyrus dif
f
erenc
e
s o
r
d
er
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Arthur Da
u
ssy
EMF Compar
e
tutori
a
l:
T
utorial p
a
rt 1
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Arthur Daussy
EMF
Compare tut
o
rial: EXTlibrary pl
u
gins
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-16
Arthur Daussy
Avoid un
n
ecess
a
r
y
dialog
w
hen commiting non fr
a
gmented
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-11
Arthur Daussy
Co
r
r
ect t
h
e
o
r
d
er of processing post processor
s
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-06
Arthu
r
Da
u
ssy
[435612] Prevents me
m
ory between selection in TreeMergeView
e
r
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-04
Ar
t
hur Daussy
Correcti
o
n on UMLDifferenc
e
sOrderTest
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-04
Arthur Daussy
UML d
i
fferences order test
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Ar
t
h
u
r Daussy
[434828] Test Merge Conflict Diff With Conflic
t
in
g
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Arthur Daussy
[4
3
4822] Conflict betw
e
en
m
ove and delete
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
A
r
t
h
ur Dauss
y
Us
e
width hint in preferen
c
e pa
g
es
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
Arth
u
r
Dau
s
sy
[432033] Do not reset
Group and
f
i
l
ter afte
r
saving
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-23
Arthur Daussy
[435365] Cascading
F
i
l
ter s
h
ouldn't filter out chang
e
s
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-20
A
rt
h
u
r
D
a
ussy
[
4
34827]
W
rong overl
a
y
icon aft
e
r merge
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-13
Arthur Daus
s
y
[434
7
14] Add E
M
F Content type to model provider
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Art
h
ur D
a
uss
y
Add d
e
scrip
t
ion f
o
r "UML refined element"
filter
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Ar
t
hur Daussy
Add a
description t
o
"
Dia
g
ram Refined elements"
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Add
descr
i
ption and labe
l
to "D
i
a
gram pos
t
processor"
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Art
h
u
r Daus
s
y
Engine
s
pre
f
erence page: Correct messa
g
e dialo
g
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Groups
and F
i
lter
s
pr
e
ference page: Lines u
p
label
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
Arthur Daussy
[429636] Documentatio
n
update: Groups
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
Art
h
ur Daussy
[
430372] Do
c
umentat
i
on update
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
Arthu
r
Daussy
I
mprove
s
EMF C
o
m
pare g
l
obal preference page
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-08
Arthur Daussy
[
4
30
6
82] New test
:
Test
M
od
e
lResolverManager
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-08
Arthur Daussy
[430
6
82] User Doc: Model resolution
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-07
Arth
u
r
Daussy
I
m
proves preference page UI
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-07
Arthu
r
Daussy
[
4
30682] Imp
r
ov
e
s
ModelResolverManager
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Arthur
D
a
uss
y
Cor
r
ect Helios
comp
a
t
i
b
ilty break
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Ar
t
h
u
r
Daussy
[42944
1
]
User doc up
d
ate:
Post process
o
rs
c
onfiguration
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Arthur Dau
s
sy
[
431785] Correct
s
ynchronizat
i
on mech
a
nism
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
next