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
Fix some of the warnings
2015-05-05
Laur
e
n
t
Gou
b
e
t
Fix some of
t
he warni
n
gs
commit
|
commitdiff
|
tree
2015-05-04
Philip Lang
e
r
[
4
65331
]
Delegate file additio
n
s and deletions if missed
.
.
.
commit
|
commitdiff
|
tree
2015-05-04
L
aurent
Delaigue
Introduce logging
w
ith log4j
.
commit
|
commitdiff
|
tree
2015-04-30
P
hilip
Langer
[46532
9
] A
d
ds te
s
t for merging
new dependent but not
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
P
h
il
i
p La
n
ger
E
x
tr
a
ct common su
p
er class from git tes
t
s
r
egarding
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
Philip La
n
g
er
[
4
65329] Retu
r
n t
h
e URI of the
r
esource to be c
r
eate
d
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
Laurent Del
a
igue
[4
6
0
7
73] Liste
n
to
r
es
o
urc
e
cre
a
tion during merg
e
.
commit
|
commitdiff
|
tree
2015-04-14
Lau
r
ent Goubet
I
n
trodu
c
e
g
it-spe
c
i
f
ic support
t
o fix unuseable storage
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-07
A
xel Richard
[463445] Fix potenti
a
l NPE in
EMFCompareStructureMergeViewer
commit
|
commitdiff
|
tree
2015-04-07
St
e
fan Dirix
Update M
a
tching Chapter in
D
eveloper Documenta
t
io
n
commit
|
commitdiff
|
tree
2015-04-07
Ax
e
l Rich
a
rd
[4
6
2
550] Fix
resource
S
etHook extension-pon
t
ID
commit
|
commitdiff
|
tree
2015-03-04
Axel
Richard
[4
5
8963] E
M
FCompare o
b
jec
t
d
oesn't us
e
EMFCompareR
C
P
.
.
.
commit
|
commitdiff
|
tree
2015-02-18
Stefan Dirix
[
452147] Fix
handli
n
g of
diffs for inte
r
locked one
.
.
.
commit
|
commitdiff
|
tree
2015-02-10
La
u
rent
G
oubet
Provide coherent names for t
h
e SDK features
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Laurent Goubet
C
h
ange
f
eat
u
re names to more descriptiv
e
ones
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[
4
36
0
50] Fi
x
c
opy all doe
s
nothing
commit
|
commitdiff
|
tree
2015-02-09
Axe
l
Ri
c
hard
[4567
9
6] Cas
c
ad
i
ng filter shoul
d
n't hide move differences
commit
|
commitdiff
|
tree
2015-02-09
Axel Richa
r
d
[413038] Fix Properti
e
s
View: edit a
v
alue chang
e
s
.
.
.
commit
|
commitdiff
|
tree
2015-02-09
Axel
Ric
h
ard
[459131]
F
ix Logical M
o
de
l
R
esourc
e
s Graph upd
a
te
commit
|
commitdiff
|
tree
2015-02-03
Laurent Delaigue
[458502] NPE in EMFCom
p
areStructureMergeV
i
ewer
.
commit
|
commitdiff
|
tree
2014-12-18
A
xel Richar
d
Update develope
r
guide
commit
|
commitdiff
|
tree
2014-12-17
A
x
el Richar
d
Simplification
o
f Dependen
c
yData
commit
|
commitdiff
|
tree
2014-12-17
Axel Richard
[447
2
31] DifferenceG
r
oup: don't b
u
ild a sub tree i
f
.
.
.
commit
|
commitdiff
|
tree
2014-12-16
Axel Richard
Notify resources w
h
en runnin
g
merge all non confli
c
t
i
ng
.
.
.
commit
|
commitdiff
|
tree
2014-12-16
Axel
R
ichard
[Logical
M
odel Vi
e
w] Us
e
our own synced icon
commit
|
commitdiff
|
tree
2014-12-12
Axe
l
R
i
chard
[4
5
4735] ExpandCollapseListener raises potential NPE
commit
|
commitdiff
|
tree
2014-12-12
A
xel Rich
a
rd
Fix Un
d
o f
o
r C
o
n
t
entMe
r
geView
e
rs
commit
|
commitdiff
|
tree
2014-12-12
Axel Richard
Fix random order of Res
o
u
r
cesAt
t
achmentChanges in SMV
commit
|
commitdiff
|
tree
2014-12-11
Axel
Richard
ResourcesAttachmentChanges
m
ust be filtered in
g
roups
commit
|
commitdiff
|
tree
2014-12-11
Axel Richard
D
on't cle
a
n eventbus in c
o
mpa
r
e c
o
nfigura
t
ion
commit
|
commitdiff
|
tree
2014-12-11
Ax
e
l
R
ichard
Fix Merge
A
ll Toolbar Actions
commit
|
commitdiff
|
tree
2014-12-10
L
a
u
r
ent Goubet
P
roperly
d
ispose o
u
r
g
r
oup
providers
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent
G
oubet
Dispose of the
c
ontent v
i
ewer
s
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Null out our undo/r
e
do
a
ctions (reference to
domain)
commit
|
commitdiff
|
tree
2014-12-09
L
a
u
r
ent Goubet
Reduce
the number of loops fro
m
difference g
r
o
u
p
c
r
e
ation
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-08
Laurent Goubet
Match performance whe
n
using only
i
dentif
i
ers
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-04
Axel Richard
[442
8
97]
Pseudo conflicts
under Rea
l
Add conflicts
commit
|
commitdiff
|
tree
2014-11-21
Laure
n
t
Goub
e
t
F
ix javadoc of
t
h
e
EMF
M
o
d
elProvider to r
e
flect
c
urrent
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
L
aurent Goubet
[449162] Fix Il
l
egalStateException: The resource set
.
.
.
Also-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-07
Axel
R
ichard
[449
1
62] F
i
x Il
l
egalS
t
ateExce
p
t
i
o
n: Th
e
re
s
ource set
.
.
.
Also-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-07
Lau
r
ent Gou
b
e
t
Add missing
copyrights
commit
|
commitdiff
|
tree
2014-11-07
La
u
rent Goub
e
t
B
u
m
p versions and fix
new plu
g
ins for
M
a
r
s M
3
commit
|
commitdiff
|
tree
2014-11-04
Alexandra B
u
zila
[
44
6
25
2
] Issue
w
ith feature ordering whe
n
me
r
g
ing FeatureMaps
commit
|
commitdiff
|
tree
2014-10-29
Alexandra Buzil
a
[448464]
Source list inc
o
rrectly deter
m
i
n
ed when
undoing
.
.
.
commit
|
commitdiff
|
tree
2014-10-22
Mikaël Barbe
r
o
F
ix the l
a
bels of the SMV title
bar
commit
|
commitdiff
|
tree
2014-10-22
Mikaë
l
Barbero
Parameteri
z
e
p
roject name
and p
r
oject id to ease reuse
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur D
a
ussy
Unloads
U
ML resources thanks to th
e
reso
u
r
c
e set
ho
o
k
s
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Arthu
r
Daussy
Prev
e
nts s
c
ope t
o
filter reso
u
r
ce
s
usi
n
g pathmap
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Dauss
y
Adds
o
n
D
ispose
m
e
t
hod
on th
e
r
e
sou
r
ce set hooks
.
commit
|
commitdiff
|
tree
2014-10-14
P
h
ilip Langer
[446739] Fix
e
s obt
a
ining the tar
g
et feature
i
n t
h
ree
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Ar
t
hur Daussy
Cor
r
ects la
b
e
ls after enhancem
e
nt on conflicts
l
a
bel
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Dau
s
sy
[398
3
67] Adds Papyrus CSS
customization suppor
t
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
thur Daussy
Adds ResourceSetHook ex
t
e
n
sion
p
oi
n
t
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
thur Daussy
Prevents
loading t
w
i
c
e the same model in a N
o
t
LoadingResourc
.
.
.
commit
|
commitdiff
|
tree
2014-10-13
A
r
t
hur Daussy
[443337
]
P
revent
l
ar
g
e shapes
icons for
stereotypes
.
commit
|
commitdiff
|
tree
2014-10-13
Arthur Daussy
[4
4
6413]
S
truct
u
reMe
r
geViewer should
r
ebu
i
l
d
its tree
.
.
.
commit
|
commitdiff
|
tree
2014-10-10
L
a
u
r
ent Goubet
M
odify merge t
o
handle i
m
plic
a
t
i
o
ns prop
e
r
ly
commit
|
commitdiff
|
tree
2014-09-29
A
r
thur Da
u
s
sy
EGit beh
a
v
ior change
commit
|
commitdiff
|
tree
2014-09-25
Axel Ric
h
ard
[443031] Fix NPE on
F
eat
u
reFilter
.
referenceI
s
Se
t
commit
|
commitdiff
|
tree
2014-09-25
Axel Richard
[443968]
F
ix NPE
in Com
p
a
r
isonUtils
.
g
e
tSub
D
iff
s
commit
|
commitdiff
|
tree
2014-09-25
Arthur D
a
ussy
[443420] Handle n
o
t integrated dynamic
p
rofile
.
commit
|
commitdiff
|
tree
2014-09-25
Axel
R
i
chard
[404811]
Expand gro
u
p item
on dou
b
le
-
click
commit
|
commitdiff
|
tree
2014-09-25
Axe
l
R
ichard
[44175
4
] The d
e
fa
u
lt activa
t
e
d
group is built tw
i
ce
commit
|
commitdiff
|
tree
2014-09-25
Axel Rich
a
rd
[443696] Add con
t
extual menu on differences
in SMV
commit
|
commitdiff
|
tree
2014-08-22
Laurent Goubet
Fix merge-r
e
lated
UI feed
b
ack
o
f the Structure v
i
ewer
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-20
Lau
r
ent Goub
e
t
Only merge the 'many' side of an equi
v
a
lence i
n
case
.
.
.
commit
|
commitdiff
|
tree
2014-08-19
Arthur Daussy
[434621] Correction
o
n RootIDMatch
i
ng strategy
.
commit
|
commitdiff
|
tree
2014-08-05
Philip
L
anger
[413520
]
Fixes Inde
x
OutO
f
BoundsException on merging
.
.
.
commit
|
commitdiff
|
tree
2014-08-01
Ar
t
h
u
r Daussy
Co
r
rects
possible NP
E
on resource resolving
.
commit
|
commitdiff
|
tree
2014-07-08
L
aurent
G
oubet
The lo
g
i
ca
l
model
s
houl
d
find in
c
oming cross-
r
e
f
e
rences
commit
|
commitdiff
|
tree
2014-07-01
Laurent
G
ou
b
et
B
ump versions to 3
.
1
.
0 o
n
master
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goub
e
t
d
e
lete lega
c
y
plugin
commit
|
commitdiff
|
tree
2014-07-01
Laurent G
o
u
b
et
r
emove l
e
gacy
(and unbuildabl
e
)
sysml sup
p
ort
commit
|
commitdiff
|
tree
2014-06-23
Arthur
D
aussy
Add Stereotyped elemen
t
change to the UML C
o
m
p
are meta
.
.
.
commit
|
commitdiff
|
tree
2014-06-20
Arth
u
r D
a
ussy
Genera
t
es UMLComp
a
re source code with EMF 2
.
10
commit
|
commitdiff
|
tree
2014-06-20
A
r
t
hur
D
au
s
sy
Uni
t
t
est
for MD
T
Pap
y
rus differences order
.
commit
|
commitdiff
|
tree
2014-06-16
A
r
thur Daussy
A
voi
d
u
n
ne
c
ess
a
ry dia
l
og when co
m
miting non fragmented
.
.
.
commit
|
commitdiff
|
tree
2014-06-11
Laurent
G
oubet
avoid inf
i
nite looping from git wh
e
n
resolv
i
n
g
f
ails
commit
|
commitdiff
|
tree
2014-06-03
Laure
n
t
G
o
u
bet
v
a
rious so
n
ar vi
o
l
a
t
i
ons fixes
commit
|
commitdiff
|
tree
2014-06-02
Mikaël Barbero
Ad
d
transa
c
tional compare comma
n
d stack
commit
|
commitdiff
|
tree
2014-06-02
Mik
a
ël Ba
r
bero
Remov
e
dead code
commit
|
commitdiff
|
tree
2014-06-02
Mikaël Barbero
Add
model r
e
source text content mer
g
e v
i
e
wer to diagram
commit
|
commitdiff
|
tree
2014-06-02
Mikaël Barbero
up
d
ate p
r
oblem in
d
i
c
ation from a s
i
ngle location
commit
|
commitdiff
|
tree
2014-06-02
M
i
k
aë
l
Barbero
Let
t
h
e user switch to text compare from
n
o dif
f
erence
.
.
.
commit
|
commitdiff
|
tree
2014-06-02
La
u
r
ent Go
u
bet
Add Guava 15
to t
h
e accepted range
commit
|
commitdiff
|
tree
2014-05-28
M
ikaël
B
arbero
Use compare co
n
figu
r
ati
o
n labels for
s
ide gr
o
u
ps titl
e
.
commit
|
commitdiff
|
tree
2014-05-28
M
ikaël Barb
e
ro
E
x
ception can't be added to problem view
,
w
e have to
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Mikaël Barbero
Av
o
id to
d
i
s
p
atch notif
i
ca
t
ion to fix deadlock with
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Mik
a
ël
Barbe
r
o
Properly shu
t
down
d
e
l
ay
e
d e
x
e
cutor service
commit
|
commitdiff
|
tree
2014-05-28
Mik
a
ël Barbero
Add support for a new content viewer to fallba
c
k to
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Laurent Gou
b
et
L
i
m
it scope of resource de
l
ta reac
t
i
ons in the resolver
commit
|
commitdiff
|
tree
2014-05-22
M
i
k
aël Barbe
r
o
[
4354
8
3
]
C
he
c
k
f
or disp
o
s
al
of widgets befo
r
e reporting
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Laurent Goubet
try an
d
handl
e
git local revisions
during comparison
commit
|
commitdiff
|
tree
2014-05-20
Laurent Goubet
"OK" stat
u
s should still display
the comparison
commit
|
commitdiff
|
tree
2014-05-20
Mikaël B
a
rbero
A
d
d fallb
a
ck to text w
h
en
s
omething goes wrong during
.
.
.
commit
|
commitdiff
|
tree
2014-05-19
L
a
urent G
o
ube
t
tempor
a
ry impleme
n
t equals for th
e
EMFResourceMa
p
ping
commit
|
commitdiff
|
tree
2014-05-19
Mikaël
B
arbero
Avoid NPE in diagnost
i
c
viewer
commit
|
commitdiff
|
tree
2014-05-19
Mikaël B
a
r
b
ero
More gracefu
l
shutdown of threads
pool
.
commit
|
commitdiff
|
tree
2014-05-16
Mikaël
B
arber
o
Do not
r
ethrow exception when
l
oading a
r
esour
c
e
in
.
.
.
commit
|
commitdiff
|
tree
2014-05-16
Mikaël
Barbero
I
m
pro
v
e
p
rogres
s
r
e
portin
g
commit
|
commitdiff
|
tree
next