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
[57
2
074] Constraint gmf
.
run
t
ime ra
n
ge for Sir
i
us inte
g
r
ation
commit
|
commitdiff
|
tree
2018-06-04
A
rthur Daussy
[534365] Fix RecursiveModelMerger for
"
bin
a
ry" git
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arthur Daussy
Do not
handle
"
merged" fi
l
es
t
wi
c
e when JGit
s
tages
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arth
u
r Dau
s
sy
[
5
35200] Crea
t
e
a
new TreeWalk instea
d
reusing one
commit
|
commitdiff
|
tree
2018-04-12
Arthur
D
aussy
I
con folder
s
houl
d
be inclu
d
ed
in the
b
uil
d
(Eg
i
t
.
ui)
commit
|
commitdiff
|
tree
2018-04-12
Arthur Daussy
[533486] Im
p
rove content type handling by EMF Comp
a
r
e
commit
|
commitdiff
|
tree
2018-04-11
Arthur D
a
ussy
[
5
3346
7
] Fixes "require" lin
k
ing process in SiriusDi
f
fPostPr
.
.
.
commit
|
commitdiff
|
tree
2018-01-24
Arth
u
r Dauss
y
[530250]
F
i
x R
e
cursiveM
o
delMerg
e
r
to be
a
ble to handl
e
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2018-01-05
Arthur Daus
s
y
[529438] Man
u
ally dispose Dro
p
DownMergeMenuAc
t
ion when
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2017-12-26
Arthur Daus
s
y
[5
2
9212] Dispose EMFCompareColor
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-16
A
r
thur Daussy
Adds unit te
s
t fo
r
enum
commit
|
commitdiff
|
tree
2014-12-16
Arthu
r
D
a
ussy
A
d
ds new
node types
in
t
he "Nodes" m
e
tamodel to
t
es
t
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
A
rthur Daussy
Merge "[EMF Compare CLI] Add
g
i
t l
o
g
i
c
a
l
pull section
.
.
.
commit
|
commitdiff
|
tree
2014-12-03
Arthur Daussy
[EMF Compar
e
CLI] D
o
cume
n
t
at
i
on o
f
the '
l
ogicalrebase
.
.
.
commit
|
commitdiff
|
tree
2014-12-01
Ar
t
hur Daussy
Corrects an err
o
r in the 'logicalcherry-pick'documentati
o
n
.
commit
|
commitdiff
|
tree
2014-12-01
Arthu
r
Da
u
s
s
y
[EM
F
Compage CLI] Ad
d
s a
"Kn
o
wn issu
e
s
"
s
ection
.
commit
|
commitdiff
|
tree
2014-12-01
A
rthur Dau
s
sy
[
E
MF Compare CLI]
D
o
c
u
mentation of the 'lo
g
i
c
alcherry
.
.
.
commit
|
commitdiff
|
tree
2014-11-05
Arthur Da
u
s
sy
UI test
s
: Update differ
e
nc
e
s order
commit
|
commitdiff
|
tree
2014-11-05
Arthur Dauss
y
U
I t
e
st
s
: Upd
a
t
e
editor label after modificat
i
on in
.
.
.
commit
|
commitdiff
|
tree
2014-11-03
Arthu
r
Daussy
C
onfigures Q7 t
e
s
ts t
o
r
u
n
on M
a
r
s platfo
r
m
commit
|
commitdiff
|
tree
2014-10-23
Arthur Daussy
Fixes or
g
.
ecli
p
se
.
emf
.
compare
.
diagram
.
ide
.
ui
.
papyrus
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daussy
Unloads UML resour
c
es
t
h
a
nks to
t
he resource set hooks
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
thur Dauss
y
Prevents s
c
ope to f
i
lt
e
r
re
s
ources us
i
ng pa
t
hma
p
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Dauss
y
Adds onDispose method
o
n the reso
u
rce set hooks
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
thur
D
auss
y
C
o
rrects labe
l
s
a
fter enhancement on conflic
t
s la
b
e
l
.
commit
|
commitdiff
|
tree
2014-10-14
A
rthur Daussy
[
398367] Adds Papyrus C
S
S
c
ustomization s
u
pport
.
commit
|
commitdiff
|
tree
2014-10-14
Art
h
u
r Daussy
A
dds ResourceSetHoo
k
extension point
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur
D
a
uss
y
Pr
e
ve
n
ts
l
oading twice the
same model in a
N
o
t
LoadingReso
u
rc
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-13
A
r
thur D
a
u
ssy
[44
3
337]
Preve
n
t
large shapes icons for
stereotypes
.
commit
|
commitdiff
|
tree
2014-10-13
A
r
th
u
r Daus
s
y
[4
4
6
4
13] S
t
ructur
e
MergeViewe
r
should re
b
uild
i
ts tre
e
.
.
.
commit
|
commitdiff
|
tree
2014-10-09
Arthur Daussy
Up
d
ate
s
Q7 tests configuration
.
commit
|
commitdiff
|
tree
2014-10-09
Arthur Daussy
Corrects
Git label
commit
|
commitdiff
|
tree
2014-10-08
Arthur
D
aussy
Corrects typo
o
n logi
c
al mod
e
l mi
n
i
mi
z
er
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-08
Arthur Da
u
ssy
Adds tests to
l
oad UML pro
f
ile in N
o
tLoadingRe
s
o
u
r
c
eSet
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-10-08
Arthur
D
aussy
[444978]
P
revents duplicated ISt
o
rage when c
r
eating
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-29
Ar
t
hur Daussy
EGit b
e
havior change
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-25
Arthur Da
u
ssy
[44
3
42
0
] Han
d
l
e
no
t
in
t
e
g
r
ated
d
ynamic profile
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
Art
h
ur Daussy
[441089] Nagivatio
n
b
e
tw
e
en difference
s
n
ow uses an
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
A
rthur
Daussy
[443330
]
Load
UML stat
i
c profile
u
s
ing p
a
th map
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
Ar
t
hur Daussy
[44333
0
] Avoid getti
n
g a "P
r
ofile ve
r
sion
c
hange"
error
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-09-15
Art
h
ur Daussy
[443330] Improves UR
I
h
a
ndling
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-27
Arthur Daus
s
y
[
4
42355]
C
orrects label on "Repl
a
c
eWith"
dialog
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-25
Arthur Daussy
U
p
dates edi
t
o
r labels due to EGit behavior change
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-22
Arth
u
r Daussy
Updates p
r
eferences UI 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
C
o
rrects renamin
g
problem
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-21
A
rthur Daus
s
y
UI impro
v
emen
t
:
C
orrection of an
e
rror on the
re
m
ova
l
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-19
Arthur Da
u
s
s
y
UI improv
e
m
e
nt: Pre
v
ents fr
e
ezing UI d
u
rin
g
groups
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-19
A
rthur Daus
s
y
Item provide
r
s preferen
c
e page document
a
tion
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-19
Arthur
Daussy
[43
4
621] Correction
o
n Roo
t
ID
M
atching st
r
ategy
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-14
A
r
thu
r
D
aussy
[441437] Corrects an error in the developper guide
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-01
Arthur Daussy
Corrects possible
N
PE o
n
r
e
sour
c
e re
s
olvin
g
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-18
Arthur D
a
uss
y
U
pd
a
tes
externa
l
adapter fact
o
ries
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-18
Arthur Daussy
Adds Item
prov
i
der preferen
c
e page
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-18
Arthur Daussy
Tutorial part
2
: G
i
t
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-17
Arthur Daussy
Fi
l
ters EM
F
compare ada
p
ter factories u
s
ing p
r
efe
r
e
nces
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Art
h
ur Daussy
Correction of 2 checkstyle errors
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
A
r
thur Daussy
C
orre
c
tion of unit tests f
o
r
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
A
rthu
r
Dau
s
sy
Use
state
f
u
l
item providers for Diagram extensions
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Ar
t
hur
Dau
s
s
y
Regenates
.
edit code for DiagramCompa
r
e m
e
tamodel with
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur Daussy
Test integr
a
tion
of profiles i
n
EMF Co
m
pa
r
e
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur Da
u
ssy
Custom
i
zes th
e
wa
y
Stereot
y
peAttributeCh
a
nge and StereotypeR
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Ar
t
hur Daussy
Use statefu
l
i
t
em providers for UML e
x
ten
s
ion
s
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
A
r
t
h
ur Daus
s
y
Unit
t
ests for DecoratorUML
P
ro
f
ileItemPr
o
viderAdapt
e
rFactory
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Arthur
D
aussy
A
d
ds cust
o
m
stere
o
types icons
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-07-07
Ar
t
hur Daussy
Cu
t
omization of t
h
e
w
ay
s
tereo
t
yped elements are dis
p
lay
e
d
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-26
Arthur
D
a
uss
y
StereotypedE
l
eme
n
tChange
P
ostPro
c
e
s
sor
u
ni
t
tests
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-26
Arthu
r
D
a
u
ssy
Regenerates
E
MF Compare sta
t
ic test pr
o
fi
l
e
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-26
Arthur
D
aussy
A
dds UMLStereot
y
pedE
l
emen
t
Change p
o
st pr
o
cess
o
r
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-23
Arth
u
r Daussy
Add
Stereotyped element change
t
o
the UML Compare met
a
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Arthur
Daussy
G
enerates UMLCompare source code with
E
M
F
2
.
10
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Arthur
D
aussy
Unit test for
M
DT
Pa
p
yrus difference
s
or
d
er
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Arthur Daus
s
y
EMF Compare tutorial: Tutor
i
al pa
r
t 1
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-20
Arthur Daussy
EMF Compare
t
utorial: E
X
Tli
b
rary plu
g
ins
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-16
Arthur Daussy
Avoid unnec
e
ssar
y
di
a
log wh
e
n commiting
non fragmented
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-11
A
rthur Da
u
ssy
Cor
r
ect the order of processing post process
o
rs
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-06
Arthur Daussy
[43561
2
] Prev
e
n
t
s me
m
ory between selec
t
ion in TreeMergeViewer
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-04
Arthur Da
u
ssy
Co
r
rection on UML
D
iff
e
renc
e
sOrderTest
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-06-04
Arthur Daussy
UML dif
f
erences order test
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
A
r
t
hur Daussy
[434828] Test
Merge Con
f
l
ict Diff W
i
t
h
Confli
c
ting
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
A
rthur Daussy
[43482
2
] Confli
c
t between move and delete
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
A
rthur Daussy
Use width hint in pr
e
f
erence pages
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
Arthur Daussy
[432033]
D
o not
r
e
set Group and filter after sa
v
ing
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-23
Arthur
D
a
ussy
[
435365]
Ca
s
cadingFilter sho
u
ldn't filt
e
r out
changes
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-20
Arthur Daussy
[4
3
4827
]
Wron
g
overla
y
icon
a
fter m
e
rge
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-13
Arth
u
r Daus
s
y
[43
4
714] Add
EMF
Con
t
ent type to mo
d
el
p
rovider
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthur
Dauss
y
Add d
e
scr
i
p
t
i
o
n for "UML re
f
ined
eleme
n
t" filter
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Art
h
ur Dauss
y
Add a description to "Diagram
R
efined elements"
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Art
h
ur Daussy
Add de
s
cription and label to "Di
a
g
ram post processor"
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthur Daussy
Engines preferen
c
e page: Correct m
e
s
sage dialog
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthur D
a
u
s
sy
Groups
and Filters
pref
e
rence page: Line
s
up label
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
A
rth
u
r Daussy
[429636] Documentation update: Gr
o
ups
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
A
r
thur Daussy
[4
3
0372] D
o
cumentation updat
e
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
Arthur Daus
s
y
Improves EMF C
o
mpare
global preference pag
e
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-08
Arthur Dau
s
s
y
[
4
30
6
82]
New test: T
e
s
t
M
o
delResolverManager
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-08
Arthur Daussy
[430682] User Doc: Mo
d
el
r
es
o
lution
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-07
Arthur D
a
ussy
Improves preference page UI
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-07
Arthur
D
a
ussy
[43068
2
]
Improves ModelResolver
M
a
n
ager
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Arthur Dau
s
sy
Co
r
rect Helios
com
p
a
t
ibilty break
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Arthur
D
a
ussy
[42
9
44
1
] U
s
er doc update: Post pr
o
cessors configu
r
atio
n
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
[43
1
785] Corre
c
t synchronization mechanism
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
next