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
A
r
t
hur Daussy
[57
2
074]
C
o
nstraint gmf
.
ru
n
time range fo
r
Sirius
i
nteg
r
ation
commit
|
commitdiff
|
tree
2018-06-04
Ar
t
hur Da
u
ssy
[534365]
Fix RecursiveModelMer
g
er for "binary
"
git
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arthur
Dau
s
sy
D
o not handle
"
merged
"
files twice when JGit
s
ta
g
es
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arthur
Daussy
[535200
]
Create a new Tre
e
Wa
l
k
i
nstead reusing
o
ne
commit
|
commitdiff
|
tree
2018-04-12
Arthur Dauss
y
Icon f
o
lder should be included in th
e
build (Egit
.
ui)
commit
|
commitdiff
|
tree
2018-04-12
Arthur Daussy
[
533
4
8
6
]
I
mprov
e
conten
t
t
y
pe handling by EMF Compar
e
commit
|
commitdiff
|
tree
2018-04-11
Ar
t
hur Daussy
[533467]
Fixes "require" link
i
ng
p
rocess in SiriusDiffPostPr
.
.
.
commit
|
commitdiff
|
tree
2018-01-24
Art
h
ur Daussy
[530
2
50]
F
ix R
e
cursiveModelMerger to be ab
l
e t
o
handl
e
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2018-01-05
A
rthur Daussy
[529438] Ma
n
ually di
s
p
o
se D
r
o
p
Down
M
er
g
eM
e
n
u
Action when
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2017-12-26
A
r
t
hur Daus
s
y
[529212] Dispose EMFCo
m
pareCo
l
or
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
A
rthur
Dauss
y
A
d
ds unit
t
est for enum
commit
|
commitdiff
|
tree
2014-12-16
Art
h
ur Daussy
Adds new node ty
p
es in the "Nodes" metamo
d
el
t
o test
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Art
h
ur D
a
ussy
Merge "[EMF Compare CL
I
] Add g
i
t logic
a
lpull
s
ectio
n
.
.
.
commit
|
commitdiff
|
tree
2014-12-03
Arthur Dau
s
s
y
[EMF Comp
a
re CLI] Docume
n
ta
t
ion o
f
the
'l
o
gic
a
lre
b
ase
.
.
.
commit
|
commitdiff
|
tree
2014-12-01
A
rthur D
a
ussy
Correct
s
an e
r
ror in the
'l
o
gicalcher
r
y-p
i
ck
'
doc
u
mentat
i
on
.
commit
|
commitdiff
|
tree
2014-12-01
Arth
u
r Daus
s
y
[EMF C
o
mpage
CLI] Adds a "Known
iss
u
e
s
" section
.
commit
|
commitdiff
|
tree
2014-12-01
Arth
u
r Daussy
[
EMF Compare CLI] Docum
e
n
tat
i
on of the
'logicalcherry
.
.
.
commit
|
commitdiff
|
tree
2014-11-05
Arthur Da
u
ssy
UI
tes
t
s: U
p
date differen
c
es or
d
e
r
commit
|
commitdiff
|
tree
2014-11-05
Ar
t
hur Daussy
UI
tests:
U
pdate e
d
itor label aft
e
r
m
o
dific
a
tion
in
.
.
.
commit
|
commitdiff
|
tree
2014-11-03
A
rth
u
r Dauss
y
Co
n
figure
s
Q7 tests to run on Mars platform
commit
|
commitdiff
|
tree
2014-10-23
Arthur Dau
s
s
y
Fixes org
.
ecli
p
se
.
e
m
f
.
compare
.
d
iag
r
am
.
ide
.
u
i
.
papyrus
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
A
rthur Daussy
Unloads UML r
e
sources tha
n
ks to the resource se
t
hooks
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
thur
D
aussy
Preven
t
s scope to filter reso
u
rces
u
s
ing pathmap
.
commit
|
commitdiff
|
tree
2014-10-14
Ar
t
hur Dauss
y
Ad
d
s o
n
Dispose
method
o
n th
e
resource
set hooks
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daussy
Co
r
rects labels after enh
a
nce
m
en
t
on
conflicts la
b
el
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
thur
D
aussy
[398367] Adds
Pa
p
yrus
C
SS cust
o
miza
t
ion support
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur
D
aussy
Adds Re
s
ourceSetH
o
o
k extensi
o
n point
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daussy
P
revents loading twice the sa
m
e model in
a NotLoa
d
ingResourc
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-13
Arthur D
a
ussy
[443337] Prevent lar
g
e
shapes ico
n
s for ster
e
o
t
y
pes
.
commit
|
commitdiff
|
tree
2014-10-13
Arthur
D
auss
y
[44
6
4
1
3
]
S
t
ruct
u
reMergeV
i
e
w
e
r should
rebuild its t
r
ee
.
.
.
commit
|
commitdiff
|
tree
2014-10-09
A
rt
h
u
r
Dau
s
sy
Updates Q7 tests configuration
.
commit
|
commitdiff
|
tree
2014-10-09
Arth
u
r Daussy
C
orr
e
cts Git la
b
el
commit
|
commitdiff
|
tree
2014-10-08
A
rthur Daus
s
y
Corrects
typo o
n
log
i
c
a
l model m
i
nimizer
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-08
Arthur Daussy
Add
s
tests t
o
loa
d
UML pro
f
ile i
n
NotLoa
d
ingResourceSet
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-08
Arthu
r
Dau
s
sy
[444978] Pr
e
vent
s
duplicated
IStorage when
cr
e
ating
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-29
A
r
th
u
r
Daussy
EGit behavior chang
e
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
Arth
u
r Daussy
[
44342
0
] H
a
ndle not i
n
tegra
t
ed dynamic profil
e
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
Arthur Dau
s
sy
[441089] Nagivation
b
etween di
f
feren
c
e
s
n
o
w
use
s
an
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
Arthur Daussy
[443330] Load UML sta
t
ic profile usin
g
path
m
ap
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
Art
h
ur Daussy
[443330]
A
vo
i
d getting a "Profile version
c
hange" error
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
Arthur Daussy
[443330] Improves U
R
I h
a
ndli
n
g
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-27
A
r
thur Daussy
[442
3
55] Correct
s
lab
e
l
o
n
"ReplaceWith" d
i
a
log
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-25
Arthur Daus
s
y
U
pdates editor labels due to EGit
b
e
h
av
i
or change
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-22
Arthur Daussy
Updates preferences UI
tests to adapt t
o
new content
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-22
Arth
u
r
Dauss
y
Corrects
renami
n
g p
r
oble
m
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-21
Arthur Daussy
U
I impro
v
e
me
n
t: Correct
i
o
n of an err
o
r
on th
e
removal
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-19
Ar
t
hur
D
aussy
U
I
improvement: Prev
e
nts fr
e
ez
i
ng UI duri
n
g groups
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-19
Arthur
D
aussy
Item provid
e
rs preference page
d
ocumentation
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-19
Arthur Daussy
[43462
1
] C
o
rr
e
ction
o
n
Roo
t
IDMatchin
g
str
a
tegy
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-14
Arthu
r
Daussy
[441437] Corrects an error in the developper guide
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-01
Arth
u
r
D
aussy
Corre
c
t
s
possible NPE on resou
r
ce resolving
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-18
Ar
t
hur Daussy
Updates exte
r
n
a
l
a
dapter factories
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-18
Arthur
Dau
s
sy
Adds Item provider prefe
r
e
n
ce page
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-18
Arthur Daussy
Tutoria
l
part 2 :
Git
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-17
Arthu
r
Daussy
Fil
t
e
rs EMF
c
o
m
p
ar
e
adapter factories using preferences
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Art
h
ur Dau
s
sy
Correc
t
i
on
o
f 2 checksty
l
e
errors
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arth
u
r
Daussy
C
o
rrec
t
i
o
n of unit tests fo
r
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
A
r
t
hur Dau
s
sy
U
se
s
t
ateful item pro
v
iders fo
r
Dia
g
ram extensions
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Ar
t
hur Daussy
R
e
genates
.
edit code f
o
r Diagra
m
C
omp
a
re metamodel
w
ith
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur Daussy
Test integration of profiles in EMF Compare
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur Dau
s
sy
Customizes the way StereotypeAttributeChang
e
and St
e
reotypeR
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur Daussy
Use statef
u
l
i
tem provi
d
ers for UML exte
n
sio
n
s
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur Da
u
s
sy
Unit tests for Decora
t
orUM
L
ProfileItemProv
i
der
A
d
a
pterFac
t
ory
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur
D
a
u
ssy
Adds cu
s
tom
s
tereotypes
i
cons
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur Daussy
Cu
t
omization of t
h
e
way s
t
ereotyped elements are displayed
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-26
Art
h
ur Daussy
St
e
reotypedElementChange
P
ost
P
rocessor unit
t
e
s
ts
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-26
Arthur Daussy
Regener
a
tes EMF Compare static tes
t
profile
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-26
Art
h
ur
D
a
ussy
A
d
ds UMLSter
e
o
typ
e
dElementChange post processor
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-23
Arthur Dau
s
sy
Add
S
ter
e
o
typed e
l
e
m
ent change to
the UML Compare meta
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Ar
t
h
u
r D
a
ussy
Generates U
M
LComp
a
re
s
o
u
rce
c
o
de
wi
t
h
E
MF 2
.
1
0
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Arthur D
a
ussy
Unit test f
o
r MDT Papyrus differences order
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Arthur Daussy
EMF C
o
mpa
r
e tutor
i
al
:
T
u
torial part 1
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Arthur
Daus
s
y
EMF C
o
mpare tut
o
rial:
EXTlibrar
y
plugins
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-16
Arthur Daussy
Avoid un
n
ece
s
sary dialog whe
n
commi
t
ing no
n
fragmented
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-11
A
rt
h
ur Daussy
Correct the or
d
er of processing pos
t
p
r
o
cessors
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-06
A
rthur Daussy
[435612] Prevents memory betwee
n
selectio
n
in TreeMergeV
i
ewer
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-04
A
rthur Daussy
Co
r
r
e
c
tion on UMLDif
f
erencesOrd
e
rTe
s
t
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-04
Arthu
r
Daussy
UML dif
f
ere
n
ce
s
order test
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Arthur Daus
s
y
[43482
8
] Test
M
erge Conflict Dif
f
With Conflict
i
ng
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Arthur Dauss
y
[434822] Conflict between move and delete
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
Arthur Daussy
Use width h
i
nt in preference pages
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
Arth
u
r
Daussy
[432033] Do
not re
s
et Gr
o
up
and filter aft
e
r
s
aving
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-23
Arthur Dau
s
sy
[435365] C
a
scadin
g
Filter shouldn't filter out chang
e
s
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-20
Arthu
r
Dau
s
s
y
[43
4
827] Wrong
overlay icon aft
e
r merge
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-13
Art
h
u
r
Daussy
[4347
1
4] Add EMF Content type to mo
d
el
p
r
ovider
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthu
r
D
aussy
Add descri
p
tio
n
for "UML re
f
ined el
e
ment
"
filter
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Art
h
u
r
Dauss
y
Add a
d
escription
t
o
"
Diagr
a
m Refined elements"
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arth
u
r Dauss
y
A
dd descr
i
ptio
n
and lab
e
l to "Diagram po
s
t processor
"
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthu
r
D
a
ussy
E
ngines pre
f
erence page:
C
o
r
r
e
ct message
di
a
log
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arth
u
r Daussy
Gro
u
ps a
n
d Filters preference page: L
i
nes up la
b
el
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
Arthur
Daussy
[429636] Document
a
ti
o
n upd
a
te: Gr
o
ups
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
Arthur Daussy
[430372]
D
ocumentation update
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
Ar
t
h
u
r Daussy
Improves EMF C
o
mpare global preference pa
g
e
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-08
Arthur Daussy
[430682]
New test: Test ModelResolverManager
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-08
Arthur
D
aussy
[430
6
82] User Doc: Mo
d
el
resolution
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-07
Arthur
D
aussy
Improves
p
reference
p
ag
e
UI
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-07
Art
h
ur
Daussy
[430682] Improves
M
ode
l
R
eso
l
verM
a
n
a
g
er
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
Corr
e
ct
Helios compatibilt
y
break
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
A
r
thur Daussy
[429441]
U
s
er doc update: Po
s
t
p
r
ocessors configuratio
n
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daus
s
y
[43
1
785] Correct synchr
o
nization mechanism
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
next