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
Prep
a
re for version
2
.
2
commit
|
commitdiff
|
tree
2013-08-19
Mikaël Barbe
r
o
Fix
r
egression i
n
troduced in a36c7e
2
1
f
724
3
a0019d1a63cd2d997e
.
.
.
commit
|
commitdiff
|
tree
2013-08-14
Mi
k
aël Barbero
Restore back t
h
e (for
e
/b
a
c
k
)
g
round color
of ite
m
s in
.
.
.
commit
|
commitdiff
|
tree
2013-08-14
Mikaël Barbero
Display
number of computed a
n
d filter
e
d d
i
fferences
.
.
.
commit
|
commitdiff
|
tree
2013-08-14
Mikaël
B
arber
o
Simplify display of co
n
f
l
i
ct objects
commit
|
commitdiff
|
tree
2013-08-14
Mikaël
B
arbero
Workaround bug 293926 only when install
e
d
o
n
3
.
7 and
.
.
.
commit
|
commitdiff
|
tree
2013-08-14
Mik
a
ël Barbero
Restor
e
label display on top
of s
t
ructure
m
e
rge
v
iewer
commit
|
commitdiff
|
tree
2013-08-14
Mikaël Barbero
Add accesso
r
for
m
atch resource
t
o let compari
n
g resource
.
.
.
commit
|
commitdiff
|
tree
2013-08-14
Mikaë
l
B
a
r
bero
F
i
x potentia
l
In
d
exOutOfBoundException
commit
|
commitdiff
|
tree
2013-08-14
Mika
ë
l Barbe
r
o
D
o
n
ot d
i
splay number o
f
unresolved differences on
.
.
.
commit
|
commitdiff
|
tree
2013-08-14
Mikaël Barbero
Activate by default the "
b
y side"
g
roup
commit
|
commitdiff
|
tree
2013-08-14
Mikaë
l
Ba
r
bero
Do not cont
r
i
bu
t
e more
t
han one content merge viewer
.
.
.
commit
|
commitdiff
|
tree
2013-08-05
Mikaël Barbero
U
p
date action icons
Signed-off-by: Mikaël Barbero <
mikael.barbero@obeo.fr
>
commit
|
commitdiff
|
tree
2013-07-30
Mikaël Barbero
Restore undo/r
e
do
facilit
i
es i
n
EMF Compare t
e
x
t merge
.
.
.
Signed-off-by: Mikaël Barbero <
mikael.barbero@obeo.fr
>
commit
|
commitdiff
|
tree
2013-07-29
Mikaël
B
arber
o
Removed RankedAd
a
p
t
erFactory class
.
Signed-off-by: Mikaël Barbero <
mikael.barbero@obeo.fr
>
commit
|
commitdiff
|
tree
2013-07-29
Mikaël Barbe
r
o
Use EMF
C
ompare's AdapterF
a
ctory registry
in co
n
tent
.
.
.
Signed-off-by: Mikaël Barbero <
mikael.barbero@obeo.fr
>
commit
|
commitdiff
|
tree
2013-07-29
Mikaë
l
Barbero
Prevent potential ConcurrentModi
f
icationException
.
Signed-off-by: Mikaël Barbero <
mikael.barbero@obeo.fr
>
commit
|
commitdiff
|
tree
2013-07-23
Mikaël Ba
r
ber
o
[413511] Do not includ
e
r
o
ot o
f
TreeIterator
Signed-off-by: Mikaël Barbero <
mikael.barbero@obeo.fr
>
commit
|
commitdiff
|
tree
2013-07-23
Mikael Barbero
Merge "New
ex
t
ension point to exten
d
g
r
oup p
r
ovide
r
s"
commit
|
commitdiff
|
tree
2013-07-16
M
i
kael Barb
e
ro
Merge
"[412748]
E
MF Compare Prop
e
rty View"
commit
|
commitdiff
|
tree
2013-07-16
M
i
kael Barbero
Mer
g
e "Add R
C
P UI tests
.
"
commit
|
commitdiff
|
tree
2013-07-16
Mikaël Barbero
Ref
a
ct
o
ring
of
t
h
e merger
s
commit
|
commitdiff
|
tree
2013-07-16
Mik
a
ël Barb
e
ro
Refactor Groups
.
commit
|
commitdiff
|
tree
2013-06-28
Mikaël Barbe
r
o
add Kepler final
target platfo
r
m d
e
finition
commit
|
commitdiff
|
tree
2013-06-19
Mikael B
a
rb
e
ro
Merge
"Cache the d
e
pendency graph as Team calls it
.
.
.
commit
|
commitdiff
|
tree
2013-06-14
Mikaël Barbero
[410738] add p2
.
inf to still prov
i
de org
.
e
clipse
.
e
mf
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
Mi
k
aël Bar
b
ero
[4
0
9
281] setSelect
i
on to
w
i
d
get to avoid cont
e
n
t viewer
.
.
.
commit
|
commitdiff
|
tree
2013-05-30
Mikaël Barbero
Ne
v
e
r
com
p
ete with Docum
e
n
t
upda
t
ing during model
sync
h
roniz
.
.
.
commit
|
commitdiff
|
tree
2013-05-30
Mikaël Barbe
r
o
[409363]
d
isplay relate
d
chan
g
e
s for a A
t
tributeChange
.
.
.
commit
|
commitdiff
|
tree
2013-05-29
M
i
kaël B
a
rbero
[409262]
U
I re
l
ated operations
i
n
comma
n
dS
t
a
c
kChan
g
ed
.
.
.
commit
|
commitdiff
|
tree
2013-05-27
M
ikaël Barbero
update ta
r
get platform defin
i
tion
commit
|
commitdiff
|
tree
2013-05-23
Mikaël Barbero
f
i
x N
P
E whe
n
closin
g
t
h
e compare e
d
itor before
commit
|
commitdiff
|
tree
2013-05-22
M
ikaë
l
Barbero
ad
d
k
e
pl
e
r rc1 tar
g
et platform defin
i
tion
commit
|
commitdiff
|
tree
2013-05-15
Mikaël B
a
rbe
r
o
add ke
p
ler m7 targ
e
t pla
t
form
commit
|
commitdiff
|
tree
2013-05-13
Mi
k
aël B
a
rbero
fi
x
choco commit
commit
|
commitdiff
|
tree
2013-05-13
M
ikaël Barbero
c
h
ange the range for th
e
#populateMenu
M
a
n
ager fix
commit
|
commitdiff
|
tree
2013-05-02
Mikaël Bar
b
ero
remove
u
n
necessary singleton d
i
rective
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Barb
e
ro
[40
6
537] Edit
i
o
n
of text
merge viewer
live-
u
pdates
.
.
.
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Barbero
Execute
U
I-r
e
l
ated code in safe utility
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Barbero
Added minimum version of UML to 4
.
0
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Barbero
Added me
t
hod to log exc
e
ptions
commit
|
commitdiff
|
tree
2013-04-30
Mikaël B
a
rbero
r
emove hard dependency to uml 4
.
1 in t
e
sts
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Bar
b
ero
remove
hard d
e
p
endency to p
a
pyrus
0
.
10
in tests
commit
|
commitdiff
|
tree
2013-04-29
Mikaël B
a
rbe
r
o
Removed unne
c
essar
y
keyword
commit
|
commitdiff
|
tree
2013-04-29
M
ikaël Ba
r
b
e
ro
A
d
d progr
e
ss moni
t
or to logical
model resolution
.
commit
|
commitdiff
|
tree
2013-04-26
Mikaël Barbero
Fixed the en
a
ble status of merge
b
utton
commit
|
commitdiff
|
tree
2013-04-26
Mi
k
aël Barb
e
r
o
[406445
]
copy all should also work in 2
w
ays
commit
|
commitdiff
|
tree
2013-04-26
M
ikaël Barbero
[406626]
u
pdate dirty
s
tate
d
uring content
m
erg
e
r
viewer
.
.
.
commit
|
commitdiff
|
tree
2013-04-25
M
ikaël Barbero
[40654
1
] allo
w
merg
e
w
hen compari
n
g two EObjec
t
s
commit
|
commitdiff
|
tree
2013-04-25
M
ikaël B
a
rb
e
ro
make the sa
v
e
possib
l
e from the EMFComp
a
reText
M
e
r
geViewer
commit
|
commitdiff
|
tree
2013-04-25
M
i
ka
ë
l Bar
b
e
r
o
[406548] A
l
lo
w
t
o save
m
o
r
e
than
o
nce
commit
|
commitdiff
|
tree
2013-04-25
Mi
k
aël Bar
b
ero
Remove comparison cache field
commit
|
commitdiff
|
tree
2013-04-25
Mikaël Barbero
[406536
]
Listen to t
e
xtual merge t
o
update
the dir
t
y
.
.
.
commit
|
commitdiff
|
tree
2013-04-25
Mikaël Ba
r
b
e
ro
[406
5
24] call super
.
start(
)
and
s
u
per
.
stop() in cla
s
s
.
.
.
commit
|
commitdiff
|
tree
2013-04-23
Mikaël
Barbero
update TP to m6
commit
|
commitdiff
|
tree
2013-04-23
Mikaël
Barber
o
Remo
v
e d
e
ad co
d
e
commit
|
commitdiff
|
tree
2013-04-19
Mikaël Barbero
Conflic
t
and
pseudo
conflict ico
n
s
commit
|
commitdiff
|
tree
2013-04-19
Mikaël Barbero
S
i
m
p
ler d
i
splay for matc
h
overlay
commit
|
commitdiff
|
tree
2013-04-18
Mikaël B
a
rbero
Fix po
t
e
ntial NPE
.
commit
|
commitdiff
|
tree
2013-04-18
M
i
kaël Barbero
Open Tree
C
ontentMerge
V
iewer o
n
a M
a
tch
commit
|
commitdiff
|
tree
2013-04-18
Mikaë
l
Barbero
do
n
ot override setSe
l
ecti
o
n anym
o
r
e
commit
|
commitdiff
|
tree
2013-04-18
Mi
k
aël Bar
b
e
ro
Handle pseudo conflict in tr
e
e vi
e
wers
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
Icon
and overl
a
y of
p
seudo conflict
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
f
il
t
er out child
r
en of
c
o
ntainment referen
c
es
that
.
.
.
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
Handle multiple root el
e
ments
.
commit
|
commitdiff
|
tree
2013-04-18
M
ikaël Barb
e
r
o
d
o
n
o
t
f
ilters out pseudo
confli
c
t
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
Compute model
differe
n
ces i
n
back
g
round
.
commit
|
commitdiff
|
tree
2013-04-17
Mikaël Bar
b
ero
re
m
ove unnecessary p
s
eudo dele
t
e co
n
flict filter
commit
|
commitdiff
|
tree
2013-04-17
Mika
ë
l
Barbero
o
o
o
ps
.
.
.
2
commit
|
commitdiff
|
tree
2013-04-17
M
i
kaël Barbe
r
o
oop
s
.
.
commit
|
commitdiff
|
tree
2013-04-17
Mi
k
aë
l
Barbero
m
o
ve
a
ll log
i
cal model code
t
o int
e
rnal
commit
|
commitdiff
|
tree
2013-04-17
Mi
k
aël Barbero
Happy ch
e
ck
s
tyle
commit
|
commitdiff
|
tree
2013-04-16
M
i
kaël
B
a
rbero
fi
x
st
r
a
nge selection b
e
hav
i
or after a
m
erge
commit
|
commitdiff
|
tree
2013-04-16
Mik
a
ë
l
Barb
e
ro
fi
x
ho
w
children
f
e
atures
are retr
i
ev
e
d
commit
|
commitdiff
|
tree
2013-04-16
Mikaël Barbero
s
ometim
e
s par
e
nt is null
(when it i
s
the roo
t
.
.
.
)
commit
|
commitdiff
|
tree
2013-04-15
Mikaël B
a
rbero
fix
r
egressi
o
n
while o
p
ening compare edito
r
/
dial
o
g
commit
|
commitdiff
|
tree
2013-04-15
M
i
kaël Ba
r
bero
fix N
P
E when
c
o
mparing 2
EO
b
jects
commit
|
commitdiff
|
tree
2013-04-15
Mikaël Barbero
add
support for
save a
c
tion with juno
commit
|
commitdiff
|
tree
2013-04-15
Mikaël Ba
r
b
e
ro
f
i
x
c
e
nt
e
r line
when
d
i
ff i
s
a mov
e
commit
|
commitdiff
|
tree
2013-04-15
Mikaël Bar
b
e
ro
add pseudo
c
onflic
t
merger
commit
|
commitdiff
|
tree
2013-04-12
M
ikaël Barbero
re-enable copy
a
ll non reflective
in TCMV
commit
|
commitdiff
|
tree
2013-04-12
Mi
k
a
ë
l Barbero
Displayi
n
g tree
of containement referenc
e
changes
commit
|
commitdiff
|
tree
2013-04-10
Mi
k
aël
B
ar
b
er
o
do not use raw type
commit
|
commitdiff
|
tree
2013-03-19
Mikaël B
a
rber
o
Add
K
e
pler
M
6 tar
g
et platfor
m
definition
commit
|
commitdiff
|
tree
2013-03-19
Mikaël Barbero
Add x
-
friends betw
e
e
n
our plugins
commit
|
commitdiff
|
tree
2013-03-19
Mi
k
aël Barbero
make diagram filter internal
commit
|
commitdiff
|
tree
2013-03-18
Mikaël Barbero
[400234] Add accessor factory for
Co
m
pa
r
ison objects
commit
|
commitdiff
|
tree
2013-03-16
Mikaël Barber
o
[40
3
543]
D
o no
t
call Eco
r
eUtil
.
c
o
nvertToString
(
) i
f
.
.
.
commit
|
commitdiff
|
tree
2013-03-15
M
ikaël Barbe
r
o
an e
x
ce
p
tion
h
as
to be thrown to be useful!
commit
|
commitdiff
|
tree
2013-03-15
Mikaël Barbero
[403
4
2
3] fix N
P
E when c
o
mpari
n
g profiled UM
L
2 3
.
x
commit
|
commitdiff
|
tree
2013-03-13
Mikaël Barbero
add content typ
e
bi
n
ding
for default em
f
compa
r
e conte
n
t
.
.
.
commit
|
commitdiff
|
tree
2013-03-13
Mikaël Barbero
fix bug in diffnode (should return null
w
hen needed)
commit
|
commitdiff
|
tree
2013-03-13
Mikaël Barbero
rename UML2 ide(
.
ui) pack
a
g
e
s to rcp(
.
ui)
commit
|
commitdiff
|
tree
2013-03-13
M
ikaël Barbero
r
ename UML2
i
de(
.
ui) p
l
ugins to
rcp(
.
ui)
commit
|
commitdiff
|
tree
2013-03-13
Mikaël Barbero
add
b
a
s
ic
implementation of post
processor
descriptor
commit
|
commitdiff
|
tree
2013-03-13
Mi
k
aël Barbero
move accessorFa
c
t
o
ry extension point from ide
.
u
i
to
.
.
.
commit
|
commitdiff
|
tree
2013-03-12
Mi
k
aël
Bar
b
ero
[44393] hide "expand
"
b
utton in front of item with
.
.
.
commit
|
commitdiff
|
tree
2013-03-12
M
i
kaë
l
Barbero
chec
k
style
a
n
d f
i
ndbugs
commit
|
commitdiff
|
tree
2013-03-12
M
ikaël Bar
b
er
o
h
a
p
py
c
heckstyle
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Barbero
r
e
facto
r
ed IPostP
r
o
cessor t
o
m
o
ve ns
U
RI
a
n
d resou
r
ceURI
.
.
.
commit
|
commitdiff
|
tree
next