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
Prepare for version 2.2
2013-08-19
Mikaël Barbero
Prepare for version 2
.
2
commit
|
commitdiff
|
tree
2013-08-19
Mikaël Barbero
Fix regression intro
d
uce
d
in a36c7
e
21f7
2
43a0019d1a63
c
d2d9
9
7
e
.
.
.
commit
|
commitdiff
|
tree
2013-08-14
Mikaël Barbero
Restore back t
h
e (fore/back)ground color of item
s
in
.
.
.
commit
|
commitdiff
|
tree
2013-08-14
Mikaël Barbero
Display number
o
f computed and filtered
difference
s
.
.
.
commit
|
commitdiff
|
tree
2013-08-14
Mikaël B
a
r
bero
Simplify
display o
f
conflict obj
e
ct
s
commit
|
commitdiff
|
tree
2013-08-14
Mi
k
aël Barbero
Workaround
bug 293926 only when installed on 3
.
7 and
.
.
.
commit
|
commitdiff
|
tree
2013-08-14
Mikaël Ba
r
bero
R
e
st
o
re lab
e
l display on top of struct
u
re
m
erge viewer
commit
|
commitdiff
|
tree
2013-08-14
Mi
k
aë
l
Barbe
r
o
Add accessor
for mat
c
h resou
r
ce to l
e
t comparing r
e
source
.
.
.
commit
|
commitdiff
|
tree
2013-08-14
M
ikaël Barbero
Fix pote
n
tial IndexOutOfBou
n
dE
x
cep
t
i
o
n
commit
|
commitdiff
|
tree
2013-08-14
Mikaël
B
arbero
Do not
display number
of unr
e
solved differences on
.
.
.
commit
|
commitdiff
|
tree
2013-08-14
M
i
kaël Barbero
Activate
b
y default the
"
by side" gro
u
p
commit
|
commitdiff
|
tree
2013-08-14
Mika
ë
l Barbero
D
o
no
t
contrib
u
te
m
ore
t
han
o
ne content me
r
ge viewer
.
.
.
commit
|
commitdiff
|
tree
2013-08-05
Mikaël Barbe
r
o
Upd
a
t
e act
i
on i
c
ons
Signed-off-by: Mikaël Barbero <
mikael.barbero@obeo.fr
>
commit
|
commitdiff
|
tree
2013-07-29
Mikaël Barber
o
Prev
e
nt po
t
ential ConcurrentModificat
i
on
E
xc
e
ption
.
Signed-off-by: Mikaël Barbero <
mikael.barbero@obeo.fr
>
commit
|
commitdiff
|
tree
2013-07-23
Mikaël Ba
r
bero
[413511] Do not include root
of
T
reeIterator
Signed-off-by: Mikaël Barbero <
mikael.barbero@obeo.fr
>
commit
|
commitdiff
|
tree
2013-07-16
Mik
a
ë
l Barbero
Refac
t
orin
g
of
the me
r
g
ers
commit
|
commitdiff
|
tree
2013-06-27
Axel Richar
d
[398361] Enhanc
e
d Model Merge
UI
commit
|
commitdiff
|
tree
2013-06-18
Lau
r
en
t
Goubet
Extract and extend comp
a
r
i
son scope builder, minimizer
.
.
.
commit
|
commitdiff
|
tree
2013-06-14
Mikaël Barb
e
ro
[410738] add p2
.
inf to still provid
e
or
g
.
eclips
e
.
emf
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
Ce
d
ric Noto
t
[4
0
6406
]
Fix Decorators may be
shifted in rela
t
ion
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
Mikaë
l
Barbero
[409
2
81] setSelect
i
on to widget to avoid
content viewer
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
A
x
el
R
ichard
[396260] The
s
truct
u
re me
r
g
e
v
i
ewer s
h
o
uld
n
o
t
unload
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
A
xel Ric
h
ard
[402421]
N
otSerializableExc
e
ption when
sa
v
e the compariso
n
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
Axel Richard
[40
9
2
9
3] Fix for Ex
p
orting c
o
mparison model fails after
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
Axel R
i
c
h
ard
[40
9
289] fix for diff "disappears" from the UI
after
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
Axel Richard
[39
8
4
2
3]
Labels missing
on
Types of Classes of external
.
.
.
commit
|
commitdiff
|
tree
2013-05-30
Mikaël Ba
r
b
e
r
o
Never
c
ompete with Document up
d
at
i
ng durin
g
model synch
r
oniz
.
.
.
commit
|
commitdiff
|
tree
2013-05-30
Axel Richard
[
402290] fix bug on delete shows an obje
t
o
n
bo
t
h
c
ontent
.
.
.
commit
|
commitdiff
|
tree
2013-05-30
Mika
ë
l
B
arber
o
[409363
]
d
i
s
play related changes for a AttributeChange
.
.
.
commit
|
commitdiff
|
tree
2013-05-30
Cedr
i
c
Notot
Some fi
x
es on diagram co
n
t
e
nt m
e
rge vie
w
er
.
commit
|
commitdiff
|
tree
2013-05-28
Cedric Notot
F
i
x bug in displaying dia
g
r
a
ms i
n
multi
-
di
a
gram case
.
.
.
commit
|
commitdiff
|
tree
2013-05-24
Laurent Goubet
Use
S
e
ts instead o
f
L
ists when the collection is mostly
.
.
.
commit
|
commitdiff
|
tree
2013-05-24
Laurent Goubet
a
v
oid reflective Cl
a
ss
.
isA
r
ray
(
) in common cases
.
commit
|
commitdiff
|
tree
2013-05-24
Lauren
t
Goub
e
t
Do not
use loops to remove
f
r
om a
l
is
t
commit
|
commitdiff
|
tree
2013-05-24
Laurent Goubet
Unre
s
pon
s
ive UI wit
h
large models
commit
|
commitdiff
|
tree
2013-05-24
La
u
rent Goubet
M
i
n
imize number of call
s
to Equa
l
ityHelpe
r
commit
|
commitdiff
|
tree
2013-05-24
Laurent Go
u
bet
U
s
ing a "maximum size" evict
i
on
strategy d
o
es no
t
scale
.
.
.
commit
|
commitdiff
|
tree
2013-05-24
La
u
rent Goubet
Avoid nesting iterables
/
iterato
r
s
with con
c
a
t whe
n
.
.
.
commit
|
commitdiff
|
tree
2013-05-24
Cedric Notot
A
dd te
s
t t
o
c
heck inters
e
c
t
i
ons between macros
c
opic
.
.
.
commit
|
commitdiff
|
tree
2013-05-24
Axel Richard
[408233] Fix In
d
e
x
out of bounds Excep
t
ion
commit
|
commitdiff
|
tree
2013-05-23
Mikaël
B
arbero
fix N
P
E whe
n
closing the compare
e
ditor
b
efore
commit
|
commitdiff
|
tree
2013-05-22
Mikaë
l
Barbero
add k
e
pler
rc1 target
p
latform defi
n
ition
commit
|
commitdiff
|
tree
2013-05-15
Mikaël Barbero
a
dd kepler
m
7 target platform
commit
|
commitdiff
|
tree
2013-05-13
Mikaël
B
a
rbero
fix choco commit
commit
|
commitdiff
|
tree
2013-05-13
Mikaël Barbero
ch
a
nge
t
h
e r
a
n
ge
f
o
r t
h
e
#pop
u
l
a
teMenuManager fix
commit
|
commitdiff
|
tree
2013-05-02
M
ika
ë
l
Barb
e
r
o
r
e
m
o
v
e unnecess
a
ry singleton
d
i
r
e
ctiv
e
commit
|
commitdiff
|
tree
2013-04-30
M
ikaël Barbero
[40653
7
]
E
dition of text merge viewer live-update
s
.
.
.
commit
|
commitdiff
|
tree
2013-04-30
M
ikaël
B
arbe
r
o
Execute
UI-r
e
lated c
o
de
i
n sa
f
e utility
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Ba
r
bero
Added mi
n
imum ve
r
sion of UML to 4
.
0
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Barber
o
Adde
d
m
ethod to l
o
g exceptions
commit
|
commitdiff
|
tree
2013-04-30
Mikaël B
a
rb
e
ro
remove hard
d
e
pendency to uml 4
.
1 in tests
commit
|
commitdiff
|
tree
2013-04-30
M
i
kaël B
a
rbero
r
e
move hard
d
ependency to p
a
pyrus 0
.
10 in
tests
commit
|
commitdiff
|
tree
2013-04-29
Mika
ë
l Barbero
Removed unnecessa
r
y k
e
yword
commit
|
commitdiff
|
tree
2013-04-29
Mikaë
l
Barbero
Add progres
s
monitor
to logical mod
e
l
r
esolu
t
ion
.
commit
|
commitdiff
|
tree
2013-04-26
Mikaël Barbero
F
i
x
ed the enabl
e
s
tatus
of merge button
commit
|
commitdiff
|
tree
2013-04-26
M
ikaël
Barbero
[406445] copy all
should
a
lso work
in 2 w
a
ys
commit
|
commitdiff
|
tree
2013-04-26
Mik
a
ël
B
arbero
[4066
2
6] update dirty state dur
i
n
g content merger view
e
r
.
.
.
commit
|
commitdiff
|
tree
2013-04-25
Mikaël
Ba
r
bero
[
4
06541] a
l
l
o
w
m
e
r
ge when comparing
t
wo EObjects
commit
|
commitdiff
|
tree
2013-04-25
Mikaël B
a
rbero
ma
k
e th
e
s
a
ve possibl
e
from the EMFCompareTe
x
t
M
ergeViewer
commit
|
commitdiff
|
tree
2013-04-25
Mi
k
aël Barbero
[
4
06548
]
All
o
w t
o
s
ave more than once
commit
|
commitdiff
|
tree
2013-04-25
Mi
k
aël Barb
e
ro
Remove
compariso
n
ca
c
he fiel
d
commit
|
commitdiff
|
tree
2013-04-25
Mikaël Barbero
[406536] Listen to text
u
al merg
e
t
o
u
pdate the dirty
.
.
.
commit
|
commitdiff
|
tree
2013-04-25
Mi
k
aël Barbero
[406
5
24] call super
.
s
t
art() and
supe
r
.
stop() in class
.
.
.
commit
|
commitdiff
|
tree
2013-04-23
Mikaël Barb
e
ro
u
p
d
ate TP t
o
m6
commit
|
commitdiff
|
tree
2013-04-23
M
ikaë
l
B
ar
b
ero
Remove dead code
commit
|
commitdiff
|
tree
2013-04-19
M
ikaël B
a
rbero
Conflict and pseudo confl
i
ct icons
commit
|
commitdiff
|
tree
2013-04-19
Mik
a
ël Barbero
S
impler display for match o
v
er
l
ay
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
Fix potential
N
PE
.
commit
|
commitdiff
|
tree
2013-04-18
Mik
a
ël B
a
r
b
ero
Open TreeContentMerge
V
i
ew
e
r
o
n
a Match
commit
|
commitdiff
|
tree
2013-04-18
Mikaël
B
arbero
do not o
v
erride setSelection anymore
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
Handle p
s
eudo conflict in
tree
v
iewers
commit
|
commitdiff
|
tree
2013-04-18
Mikaël
B
a
r
bero
Icon and
o
v
e
rlay
o
f pse
u
do conflict
commit
|
commitdiff
|
tree
2013-04-18
Mikaë
l
Barbero
f
i
lter out children of
containment
r
eference
s
that
.
.
.
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Bar
b
ero
Hand
l
e
mu
l
tiple root elements
.
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
d
o not f
i
lters out pseudo conflict
commit
|
commitdiff
|
tree
2013-04-18
Mikaël B
a
rber
o
Compute model differences in background
.
commit
|
commitdiff
|
tree
2013-04-17
Mikaël
Barbero
re
m
ove unnecessary pseudo delete confl
i
c
t
filter
commit
|
commitdiff
|
tree
2013-04-17
M
i
kaël Ba
r
ber
o
ooops
.
.
.
2
commit
|
commitdiff
|
tree
2013-04-17
Mik
a
ël Barbero
o
o
ps
.
.
commit
|
commitdiff
|
tree
2013-04-17
Mik
a
ël Barbero
mov
e
all logical mod
e
l
code to intern
a
l
commit
|
commitdiff
|
tree
2013-04-17
Mikaël
B
a
rbe
r
o
Happy c
h
eckstyle
commit
|
commitdiff
|
tree
2013-04-16
Mikaël Barbero
fi
x
s
t
ran
g
e selection beha
v
ior afte
r
a me
r
ge
commit
|
commitdiff
|
tree
2013-04-16
Mikaël Barbero
fix h
o
w childre
n
fea
t
ures are retrieved
commit
|
commitdiff
|
tree
2013-04-16
Mikaël Barbero
some
t
imes parent
i
s
nul
l
(when it is the ro
o
t
.
.
.
)
commit
|
commitdiff
|
tree
2013-04-15
Mikaël
Barber
o
f
i
x
regression while openi
n
g compare editor/dialog
commit
|
commitdiff
|
tree
2013-04-15
Mikaël
B
arbero
f
ix NPE when compa
r
ing 2 EObjects
commit
|
commitdiff
|
tree
2013-04-15
Mi
k
a
ë
l Barbero
ad
d
support
for save a
c
ti
o
n with juno
commit
|
commitdiff
|
tree
2013-04-15
Mika
ë
l Barbero
f
i
x
ce
n
ter line when dif
f
i
s
a mo
v
e
commit
|
commitdiff
|
tree
2013-04-15
Mikaël Barbero
add pseudo confl
i
ct merger
commit
|
commitdiff
|
tree
2013-04-15
A
x
e
l Richard
Extensib
l
e too
l
bars
commit
|
commitdiff
|
tree
2013-04-12
Mikaël Ba
r
b
er
o
re-enab
l
e
c
opy all n
o
n
refl
e
c
t
i
v
e
i
n
TCMV
commit
|
commitdiff
|
tree
2013-04-12
Mi
k
aël Barber
o
Displaying tree
of conta
i
nement
r
e
feren
c
e
c
hanges
commit
|
commitdiff
|
tree
2013-04-10
Mik
a
ël Bar
b
ero
do not use raw type
commit
|
commitdiff
|
tree
2013-03-19
Mika
ë
l Barbe
r
o
Add Kepler M6
target platform
d
efinitio
n
commit
|
commitdiff
|
tree
2013-03-19
Mikaël Barbero
Add x
-
friend
s
between our plug
i
ns
commit
|
commitdiff
|
tree
2013-03-19
Mikaë
l
Barbero
make diagra
m
filter
internal
commit
|
commitdiff
|
tree
2013-03-18
Mikaël Ba
r
be
r
o
[
400234] Add accessor fact
o
ry
for Comparison objects
commit
|
commitdiff
|
tree
2013-03-16
Mikaël Ba
r
bero
[403543] D
o
not call
EcoreUtil
.
con
v
e
r
tT
o
String()
i
f
.
.
.
commit
|
commitdiff
|
tree
2013-03-15
Mikaël Barb
e
ro
an
e
xception has t
o
be
t
hro
w
n to
be usef
u
l!
commit
|
commitdiff
|
tree
2013-03-15
M
i
k
aël Barbero
[4
0
342
3
] fix N
P
E when comparing profile
d
UML2 3
.
x
commit
|
commitdiff
|
tree
next