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
[458502] NPE in EMFCompareStructureMergeViewer.
2015-02-03
Laur
e
nt Delaigue
[4
5
850
2
]
N
PE
in EM
F
Comp
a
reStru
c
tureMe
r
geViewer
.
commit
|
commitdiff
|
tree
2014-12-18
Axel Richard
Updat
e
d
e
vel
o
per
guide
commit
|
commitdiff
|
tree
2014-12-17
Axel R
i
cha
r
d
S
i
mplific
a
tion
of De
p
endencyData
commit
|
commitdiff
|
tree
2014-12-17
Axe
l
Ri
c
hard
[
4
47
2
31
]
Di
f
f
e
renceGroup: d
o
n't build a sub tree if
.
.
.
commit
|
commitdiff
|
tree
2014-12-16
Axel Richard
Notif
y
resources wh
e
n ru
n
ning merge
all non conflicting
.
.
.
commit
|
commitdiff
|
tree
2014-12-16
Ax
e
l
Richard
[Logical Model Vi
e
w] Use our ow
n
synced icon
commit
|
commitdiff
|
tree
2014-12-12
A
x
el R
i
chard
[
4
5473
5
] E
x
pandCollapseList
e
n
er rais
e
s poten
t
ial
NPE
commit
|
commitdiff
|
tree
2014-12-12
Axel
Ric
h
ard
Fix Undo for Cont
e
ntMe
r
ge
V
iewers
commit
|
commitdiff
|
tree
2014-12-12
A
x
el Ri
c
har
d
Fix random o
r
d
er of R
e
s
our
c
esAttachm
e
ntChan
g
es in SMV
commit
|
commitdiff
|
tree
2014-12-11
A
x
e
l Richard
ResourcesAt
t
achmentChanges
m
ust be filtered in groups
commit
|
commitdiff
|
tree
2014-12-11
Axel Richard
Don't cl
e
an e
v
ent
b
us in co
m
p
are confi
g
uration
commit
|
commitdiff
|
tree
2014-12-11
A
xel Richar
d
F
i
x MergeAll Toolbar Actions
commit
|
commitdiff
|
tree
2014-12-10
Laurent Goubet
P
r
o
p
erl
y
dispose o
u
r group providers
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
L
a
urent Goubet
D
ispos
e
of the cont
e
n
t
v
i
ewers
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
L
a
uren
t
Goubet
N
u
ll out our undo/redo actions (refere
n
c
e
to dom
a
in)
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Red
u
ce
the
n
umber of
l
o
ops from difference group cr
e
at
i
on
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-08
Laurent Goubet
M
a
tch perfo
r
mance when usi
n
g only
i
dentifier
s
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-04
Axel Richard
[4428
9
7] Pseudo conflicts under Real Add conflicts
commit
|
commitdiff
|
tree
2014-11-21
La
u
rent Goubet
Fix javadoc of the EMFMo
d
e
lPro
v
ider
to reflec
t
c
urrent
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
L
a
ure
n
t
Goub
e
t
[449162] F
i
x Ill
e
gal
S
tateE
x
ception: The resource set
.
.
.
Also-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-07
Axel Richar
d
[449162] Fix IllegalStateException: The resourc
e
set
.
.
.
Also-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
Add mi
s
sin
g
copyrights
commit
|
commitdiff
|
tree
2014-11-07
Lau
r
ent Goubet
Bu
m
p
ver
s
ions and fix
n
e
w plugins for Mars M3
commit
|
commitdiff
|
tree
2014-11-04
Alexandra
Buzi
l
a
[446252] Issue
with
feature ordering when mergin
g
FeatureMaps
commit
|
commitdiff
|
tree
2014-10-29
A
lexandra
B
uzila
[448464] Source list incor
r
ectly
determined when
un
d
oi
n
g
.
.
.
commit
|
commitdiff
|
tree
2014-10-22
Mikaël Bar
b
ero
F
i
x the labe
l
s of t
h
e SMV titl
e
b
a
r
commit
|
commitdiff
|
tree
2014-10-22
Mikaël
B
arbero
Pa
r
ameterize pro
j
ect n
a
me an
d
project id to ease reuse
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
thur Daussy
Unloads U
M
L resources thank
s
t
o the resource set
hook
s
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daussy
Prevents scope to filter r
e
sources us
i
n
g
pathmap
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daussy
Adds onDispose method on the resou
r
ce set ho
o
ks
.
commit
|
commitdiff
|
tree
2014-10-14
Philip Langer
[446739] Fixes obtain
i
n
g
t
he target feature in three
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
thu
r
D
a
u
s
sy
C
o
rrects labe
l
s a
f
ter enh
a
ncement on co
n
f
l
icts
l
abel
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Da
u
ss
y
[39
8
367] Adds P
a
pyru
s
CSS cu
s
tomiz
a
tion
s
upport
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Da
u
ssy
Adds ResourceSetHook ex
t
ension po
i
nt
.
commit
|
commitdiff
|
tree
2014-10-14
Ar
t
hur Daussy
Pre
v
e
n
ts loading tw
i
ce the same model in a NotLoadingRes
o
urc
.
.
.
commit
|
commitdiff
|
tree
2014-10-13
Arthur Dau
s
sy
[443337
]
Prevent l
a
rge s
h
apes ic
o
ns
f
o
r
stereotyp
e
s
.
commit
|
commitdiff
|
tree
2014-10-13
Arthur Daussy
[446413] StructureM
e
rgeViewer sho
u
ld
rebuild its tr
e
e
.
.
.
commit
|
commitdiff
|
tree
2014-10-10
Laur
e
nt Gou
b
et
Modi
f
y
m
erge to hand
l
e implications prope
r
ly
commit
|
commitdiff
|
tree
2014-09-29
Arth
u
r Daussy
E
Git beha
v
ior c
h
ange
commit
|
commitdiff
|
tree
2014-09-25
A
x
el Richard
[4430
3
1]
Fix NPE on FeatureFilter
.
referenceIs
S
et
commit
|
commitdiff
|
tree
2014-09-25
Axel
R
ichard
[443968] Fix NPE in ComparisonUti
l
s
.
getSubDi
f
fs
commit
|
commitdiff
|
tree
2014-09-25
Arthur
D
aussy
[443420
]
Handle not in
t
e
grated dynamic pr
o
file
.
commit
|
commitdiff
|
tree
2014-09-25
A
x
el Richard
[404811] Exp
a
nd g
r
oup
item on double-c
l
ick
commit
|
commitdiff
|
tree
2014-09-25
Axel Richard
[441754] The def
a
ult activated group is b
u
il
t
tw
i
ce
commit
|
commitdiff
|
tree
2014-09-25
Axe
l
Richard
[
443696
]
Add
contextual menu on dif
f
erence
s
in SMV
commit
|
commitdiff
|
tree
2014-08-22
L
a
u
r
ent
G
o
ubet
Fi
x
mer
g
e
-
related UI feedback of
t
h
e S
t
r
u
cture viewer
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-08-20
Laurent Goub
e
t
Only merge
t
he 'man
y
' s
i
de of an equivalence in case
.
.
.
commit
|
commitdiff
|
tree
2014-08-19
A
r
th
u
r Daussy
[434621] Corre
c
tion on Roo
t
IDMatchi
n
g st
r
a
tegy
.
commit
|
commitdiff
|
tree
2014-08-05
Philip Langer
[413520]
Fixes IndexOutOfBoundsException
on merging
.
.
.
commit
|
commitdiff
|
tree
2014-08-01
Arthur D
a
ussy
Corrects possible NP
E
on res
o
urc
e
reso
l
ving
.
commit
|
commitdiff
|
tree
2014-07-08
Laur
e
nt
Goubet
T
he logical model should
find i
n
c
om
i
n
g
cross-reference
s
commit
|
commitdiff
|
tree
2014-07-01
Laurent
G
o
u
b
et
Bu
m
p versions to 3
.
1
.
0 on mast
e
r
commit
|
commitdiff
|
tree
2014-07-01
L
aurent Goubet
delete lega
c
y plugi
n
commit
|
commitdiff
|
tree
2014-07-01
Laurent
G
oubet
r
e
move lega
c
y (and unb
u
ild
a
ble) s
y
sml s
u
pport
commit
|
commitdiff
|
tree
2014-06-23
Arthur D
a
u
ssy
Add Stereot
y
ped element change to the UML Compare m
e
ta
.
.
.
commit
|
commitdiff
|
tree
2014-06-20
Arthur Daussy
G
e
nerates U
M
LC
o
mpare source code with E
M
F 2
.
10
commit
|
commitdiff
|
tree
2014-06-20
Arthur Daussy
U
n
it test for
M
DT Pa
p
yrus differences order
.
commit
|
commitdiff
|
tree
2014-06-16
Ar
t
hur
D
a
ussy
Avoid unne
c
essary
d
i
a
log when commitin
g
n
o
n fragmented
.
.
.
commit
|
commitdiff
|
tree
2014-06-11
L
a
u
r
e
nt Goubet
avoid infinite loopi
n
g f
r
om git when
r
esolvi
n
g fails
commit
|
commitdiff
|
tree
2014-06-03
Laurent Goubet
v
arious sonar violations fixes
commit
|
commitdiff
|
tree
2014-06-02
Mi
k
aë
l
Barbe
r
o
A
d
d tran
s
act
i
onal compare command
s
tack
commit
|
commitdiff
|
tree
2014-06-02
Mikaël Barbe
r
o
Remove dead code
commit
|
commitdiff
|
tree
2014-06-02
Mikaël Barbero
Add model resource
text
c
ontent merge
v
i
ewer to
diagr
a
m
commit
|
commitdiff
|
tree
2014-06-02
Mikaël B
a
rber
o
updat
e
pro
b
l
e
m i
n
dication from a singl
e
location
commit
|
commitdiff
|
tree
2014-06-02
M
ikaël Barbero
L
et the user swi
t
ch to
t
ext com
p
a
r
e
from no
d
iffe
r
ence
.
.
.
commit
|
commitdiff
|
tree
2014-06-02
Lauren
t
G
ou
b
et
Add Guav
a
15
to the accepted
r
ange
commit
|
commitdiff
|
tree
2014-05-28
Mikaë
l
Barbero
Use compa
r
e c
o
nfigu
r
ati
o
n la
b
els for
side groups tit
l
e
.
commit
|
commitdiff
|
tree
2014-05-28
Mikaël Barbero
E
x
c
e
ption
c
an't be
a
dde
d
to
problem
v
ie
w
,
we
have to
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Mikaël Barb
e
ro
Avoid to dispatc
h
notification to fix deadlo
c
k with
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Mikaël Barbero
Properly shutdown delayed executor service
commit
|
commitdiff
|
tree
2014-05-28
Mikaë
l
Bar
b
ero
A
d
d support
f
or
a
new cont
e
nt viewer t
o
f
a
llback to
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Lau
r
en
t
Go
u
bet
Limit scope of resou
r
c
e
del
t
a reactions
i
n the resolver
commit
|
commitdiff
|
tree
2014-05-22
Mikaël Bar
b
e
ro
[43
5
483] Check
for disp
o
s
a
l
o
f w
i
dgets before reportin
g
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Laure
n
t
Goubet
try and h
a
ndl
e
git lo
c
a
l
revisi
o
n
s
dur
i
n
g
compariso
n
commit
|
commitdiff
|
tree
2014-05-20
L
a
u
rent Goubet
"OK" statu
s
s
h
ould st
i
ll
d
isplay t
h
e compari
s
on
commit
|
commitdiff
|
tree
2014-05-20
M
i
kaël
B
arbero
Add fallback
to
text wh
e
n so
m
ething goe
s
w
rong du
r
ing
.
.
.
commit
|
commitdiff
|
tree
2014-05-19
Laurent Go
u
b
e
t
temporary implement equals for the EMFRe
s
o
u
rceMap
p
ing
commit
|
commitdiff
|
tree
2014-05-19
M
i
k
aël Barbero
Avoid NPE in d
i
a
g
n
ost
i
c view
e
r
commit
|
commitdiff
|
tree
2014-05-19
M
i
kaël Barbe
r
o
Mo
r
e
g
raceful s
h
u
t
down
o
f threads pool
.
commit
|
commitdiff
|
tree
2014-05-16
Mikaël B
a
r
bero
D
o
not ret
h
row ex
c
eption when
loading a resou
r
ce in
.
.
.
commit
|
commitdiff
|
tree
2014-05-16
Mika
ë
l Barbero
Improve progress reporting
commit
|
commitdiff
|
tree
2014-05-14
L
a
urent Goube
t
enable pack200 and includ
e
packed
a
r
tefacts
commit
|
commitdiff
|
tree
2014-05-13
Art
h
ur Daussy
[434714] Add
E
MF Con
t
e
n
t type to
m
odel p
r
ovider
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
[4342
1
0]
IndexO
O
B
w
h
en opening resol
v
er prferences
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
Use the shared l
i
c
ense f
e
atu
r
e
.
commit
|
commitdiff
|
tree
2014-05-06
Lauren
t
G
oubet
adding CB
I
to all targets
commit
|
commitdiff
|
tree
2014-05-05
La
u
rent Goubet
redu
c
e
synch
r
onization ove
r
head of model resolvi
n
g
commit
|
commitdiff
|
tree
2014-04-17
Laure
n
t Go
u
bet
small
p
erf
o
rmanc
e
twea
k
: avoid multi
p
le eRes
o
urc
e
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
[432002] U
n
do doesn'
t
update content vi
e
wers
&
merge
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
[432141] Confl
i
cts d
i
ffs
o
rder change between comparisons
commit
|
commitdiff
|
tree
2014-04-03
Laurent Goubet
f
i
x engl
i
sh
commit
|
commitdiff
|
tree
2014-04-02
Art
h
u
r Daus
s
y
[4306
8
2
] Correction
o
n Mode
l
Res
o
lutio
n
PreferencePage
commit
|
commitdiff
|
tree
2014-04-02
A
r
thur Dau
s
sy
[430372]
A
dd synchronization beh
a
vior
.
commit
|
commitdiff
|
tree
2014-04-01
Arthur Daussy
Improvements
a
n
d
co
r
rections on ItemRegistry
commit
|
commitdiff
|
tree
2014-03-28
Axel Richar
d
[
430697]
Toolbar a
p
pears twic
e
when Replace Wi
t
h
a
ction
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
L
aurent
G
oubet
normalize EOLs
in t
h
e core (second pass)
commit
|
commitdiff
|
tree
2014-03-13
Laurent Goubet
n
o
r
m
alize EOLs in the core
(fi
r
st pass
)
commit
|
commitdiff
|
tree
2014-03-13
Arthur Daussy
[42
9
441] Extend UML Post p
r
o
cess u
i
.
commit
|
commitdiff
|
tree
2014-03-13
Laurent
G
o
ubet
normalize
EOLs
t
hrou
g
hout
E
MF Co
m
pare
commit
|
commitdiff
|
tree
2014-03-03
Lau
r
en
t
G
o
ubet
bulle
t
list s
y
ntax
commit
|
commitdiff
|
tree
next