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
unload resources on dispose (prevent UML2's CacheAdapter leak)
2012-10-12
Mikaël
B
arbero
unload
r
e
s
o
urces on
d
ispo
s
e (pre
v
ent UML2's
CacheAdapter
.
.
.
commit
|
commitdiff
|
tree
2012-09-27
Mikaël Barbero
preliminary
supp
o
rt of UMLDiff in the ID
E
UI
commit
|
commitdiff
|
tree
2012-09-27
Mikaël
B
arbero
fe
w
API opening and refacto
r
ing to allow
e
xtensi
o
n
commit
|
commitdiff
|
tree
2012-09-27
Mikaël Barbero
f
ix bug
w
hile st
o
ring previous result of compar
i
son
commit
|
commitdiff
|
tree
2012-08-31
Mikaël Barbero
add
i
temprovider s
p
e
cif
i
c implemen
t
i
o
n for all uml
.
.
.
commit
|
commitdiff
|
tree
2012-08-31
Mikaël Barbero
f
i
x ePackage
n
s
UR
I
commit
|
commitdiff
|
tree
2012-08-31
Mi
k
a
ë
l
Ba
r
bero
add r
c
p
u
i featur
e
to u
p
date s
i
te
commit
|
commitdiff
|
tree
2012-08-31
Mi
k
a
ë
l
Barbero
add rcp-ui feature to build
commit
|
commitdiff
|
tree
2012-08-31
M
ik
a
ë
l
B
arbe
r
o
ch
o
c
o, again (
g
rrr)
commit
|
commitdiff
|
tree
2012-08-31
Mik
a
ë
l
Bar
b
ero
choco-
commit
|
commitdiff
|
tree
2012-08-31
Mikaël
B
a
r
ber
o
move and
r
efact
o
r
merge viewer
f
rom ide
.
ui
t
o rcp
.
ui
commit
|
commitdiff
|
tree
2012-08-30
Mikaël Ba
r
bero
instanceof interface instead
of impl ;)
commit
|
commitdiff
|
tree
2012-08-30
Mi
k
aël Barber
o
make source view
e
rs
not edit
a
b
le to avoid
p
artial me
r
ges
commit
|
commitdiff
|
tree
2012-08-30
Mika
ë
l Barbero
handle save
on text merg
e
viewer
commit
|
commitdiff
|
tree
2012-08-30
Mikaël Barbero
remove usel
e
ss @SuppressWa
r
nin
g
commit
|
commitdiff
|
tree
2012-08-30
M
i
kaël B
a
rbero
change disp
l
ay of th
e
o
w
ner an
d
the feature of the
.
.
.
commit
|
commitdiff
|
tree
2012-08-30
M
i
kaël Barbero
code cleanup
commit
|
commitdiff
|
tree
2012-08-30
Mi
k
aë
l
Barbero
log
Throwable inste
a
d of Exc
e
pt
i
on
commit
|
commitdiff
|
tree
2012-08-29
Mikaël Barber
o
remov
e
d
ebug sysout
commit
|
commitdiff
|
tree
2012-08-29
M
i
k
a
ël Ba
r
bero
remove a lo
t
of usage of Dyna
m
i
cObject
commit
|
commitdiff
|
tree
2012-08-29
Mik
a
ë
l
Bar
b
ero
u
se f
i
e
l
d instead of ove
r
ridabl
e
met
h
od
commit
|
commitdiff
|
tree
2012-08-29
Mikaël Barber
o
add composi
t
e displaying feature and
owner of an EO
b
ject
.
.
.
commit
|
commitdiff
|
tree
2012-08-29
Mikaël Barbero
v
e
rtical bar may not
available
commit
|
commitdiff
|
tree
2012-08-28
Mikaë
l
B
arbe
r
o
d
o not draw a specific item
w
hen drawing a si
m
p
le TableItem
.
.
.
commit
|
commitdiff
|
tree
2012-08-28
M
ikaël Ba
r
bero
add som
e
helpful m
e
ssage instead o
f
dummy one
commit
|
commitdiff
|
tree
2012-08-28
Mikaël Ba
r
bero
fi
x
t
ext message f
o
r dif
f
with ki
n
d==cha
n
ge
commit
|
commitdiff
|
tree
2012-08-28
M
ika
ë
l Barbero
fix
s
ynchr
o
nizat
i
on be
t
w
een diff to be merge for all
.
.
.
commit
|
commitdiff
|
tree
2012-08-28
Mikaël Barber
o
a
dd Ref
l
e
c
t
i
veItemProviderAdapterFactory a
n
d
commit
|
commitdiff
|
tree
2012-08-28
Mik
a
ë
l Barbero
f
ix pot
e
ntial NPE
commit
|
commitdiff
|
tree
2012-08-27
Mikaël Barbero
fix getContainer() as revea
l
ed b
y
added t
e
st
-
-
w
as
.
.
.
commit
|
commitdiff
|
tree
2012-08-27
M
ikaël
B
arbero
mov
e
g
e
tAsList to ReferenceUtil
commit
|
commitdiff
|
tree
2012-08-27
Mikaël
B
arber
o
few refact
o
ring for
better
r
eadability
commit
|
commitdiff
|
tree
2012-08-24
Mikaël B
a
rbero
big rev
a
mp
of
t
h
e ide
.
ui code to supp
o
rt
some c
o
rner
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Mik
a
ël Barber
o
fix potential
NPE in DefaultEqui
E
ngin
e
commit
|
commitdiff
|
tree
2012-08-23
Mikaë
l
Barber
o
nicer test f
o
r Fe
a
tureMap
commit
|
commitdiff
|
tree
2012-08-23
Mikaël Barbero
b
e
t
ter
display text for
d
ifferences (
e
sp
.
for
k
ind
.
.
.
commit
|
commitdiff
|
tree
2012-08-23
Mikaël
Ba
r
bero
happy chec
k
style
commit
|
commitdiff
|
tree
2012-08-23
Mikaël Barbero
add meaningful toStrin
g
()
commit
|
commitdiff
|
tree
2012-08-22
Mik
a
ël Barbero
removed
D
iffEngin
e
T
est (doubl
o
n with Dif
f
Uti
l
T
e
st)
commit
|
commitdiff
|
tree
2012-08-21
Mikaël
Bar
b
ero
use supe
r
Com
p
areHandlerService ins
t
ead
of creating
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mi
k
aë
l
Barb
e
ro
hook dispos
a
l of
contro
l
to remove listen
e
rs
commit
|
commitdiff
|
tree
2012-08-21
M
ika
ë
l
Barbero
handle all di
f
feren
c
e kind
s
a
n
d not only ReferenceChange
commit
|
commitdiff
|
tree
2012-08-21
Mikaë
l
Barbero
add r
e
fresh on
change of com
m
andStack
commit
|
commitdiff
|
tree
2012-08-21
M
i
kaël Barbero
o
v
erride canE
x
ecute i
n
me
r
ge commands
commit
|
commitdiff
|
tree
2012-08-21
Mi
k
aël Barbero
handle removing of CommandSt
a
c
k
Lis
t
ene
r
o
n disp
o
sal
commit
|
commitdiff
|
tree
2012-08-21
Mik
a
ël Barbero
fi
x
NPE whe
n
ch
a
nging
f
rom EMFCompareTextMe
r
geViewer
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Barbero
d
o not try to reso
l
v
e
resources from l
o
ca
l
ResourceSet
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Barbero
add preliminary
s
upport for und
o
redo in te
x
t merge
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
Mikaël Barbero
hand
l
e un
d
o/redo on copy all
n
o
n
con
f
l
i
ct
i
ng action
commit
|
commitdiff
|
tree
2012-08-20
Mikaë
l
Ba
r
bero
add pr
e
liminary support for ISt
r
e
a
mContent
A
cc
e
ssor
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
Mika
ë
l Barbero
renamed vari
a
ble
commit
|
commitdiff
|
tree
2012-08-20
Mi
k
a
ël B
a
rbero
f
ix
i
ssue with displayed insertion poin
t
s
(wa
s
n
ot
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
Mika
ë
l
Barbero
display
merged
a
n
d discarded diff with a
g
rey font
commit
|
commitdiff
|
tree
2012-08-20
Mikaël
B
arbero
display proxy with i
t
ali
c
f
ont
commit
|
commitdiff
|
tree
2012-08-13
Mikaël Barbero
add
p
reliminary s
u
p
p
ort of undo/
r
edo
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barb
e
ro
change contrac
t
of C
o
mparis
o
n#
g
etDifferen
c
es(EObje
c
t
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
Mikaë
l
Barbero
ha
p
p
y
checkstyle
commit
|
commitdiff
|
tree
2012-08-10
M
i
kaë
l
Barbero
change DiffCrossReferencer to
h
andl
e
sub
c
lasses of
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
Mikaël
Barbero
s
om
e
refactoring to make the code c
l
earer
commit
|
commitdiff
|
tree
2012-08-10
Mikaël B
a
rbero
setThreeW
a
y
s
hould be call as early as poss
i
ble (test
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barbero
add line
s
be
t
ween diffs
commit
|
commitdiff
|
tree
2012-08-10
Mikaël
B
arbero
use
client area instead
o
f
bounds of the Ta
b
le
commit
|
commitdiff
|
tree
2012-08-10
Mi
k
aël
Barbero
f
ix clippi
n
g area issu
e
on wind
o
w
s
commit
|
commitdiff
|
tree
2012-08-09
Mikaë
l
Bar
b
e
r
o
a
d
d uml2
.
i
d
e
.
ui
commit
|
commitdiff
|
tree
2012-08-09
Mikaël B
a
rbero
add
new u
m
l
2
.
ide
.
ui plugin t
o
specializ
e
UI
commit
|
commitdiff
|
tree
2012-08-09
M
i
k
a
ël Barber
o
add specific m
e
h
tod
s
for content pr
o
v
i
de
r
s
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbero
change how group
s
are handled:
n
o more adaptation to
.
.
.
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbero
add sp
e
cific TextMergeVie
w
er
to remove
sup
p
ort
f
o
r
.
.
.
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbero
fil
t
er
ou
t
diff refined by or
requir
e
d by refin
e
s
b
y
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbero
added cross reference di
f
ference
s
o
n Compar
i
son#getDifferenc
.
.
.
commit
|
commitdiff
|
tree
2012-08-08
M
i
kaël Barbero
add
e
Re
f
erence r
e
ference on
UMLDiff EClass
commit
|
commitdiff
|
tree
2012-08-07
Mikaël
Ba
r
bero
fix ad
a
p
ter
factory
&
epackage uri after refactoring
commit
|
commitdiff
|
tree
2012-08-07
Mikaël Barb
e
r
o
some ref
a
ctoring in UM
L
c
o
mpare
extension
commit
|
commitdiff
|
tree
2012-08-06
Mikaël Barb
e
ro
r
e
m
o
ve
d
unused
m
erge
w
ay tip action
commit
|
commitdiff
|
tree
2012-08-03
Mi
k
aël
Barbero
add merge
a
ll no
n
c
onflicting diffs from
o
ne
side to
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Bar
b
ero
add custom
MergeV
i
ewerConte
n
tProvider
to handle
save
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
M
ikaël Barbero
do not
p
rovide o
v
erlay ima
g
e for m
a
t
c
h with incoming
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël
B
a
rbero
add a log(Excepti
o
n) method
commit
|
commitdiff
|
tree
2012-08-03
M
ika
ë
l
B
arbero
d
epend only on juno & orbit
u
pdate site
commit
|
commitdiff
|
tree
2012-08-03
Mika
ë
l Barbero
add a EMFC
o
m
p
areCo
n
fig
u
ration class t
o
con
f
igure the
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël
B
ar
b
ero
move eve
r
y cla
s
ses fr
o
m ide
.
u
i b
u
ndle into x
-
internal
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Bar
b
ero
print out conf
l
icts too
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
f
ai
l
fast
o
n
null
ar
g
umen
t
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
fix merge UI act
i
on
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
fix merge U
I
action
commit
|
commitdiff
|
tree
2012-08-03
Mik
a
ël
Ba
r
bero
r
e
f
actor
&
fix
g
e
t
Children fo
r
Match and Re
f
erenceChange
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mi
k
aël
Barbero
fi
x
desynchro for Attrib
u
teChange with a
n
cestor
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barb
e
ro
add consta
n
t for widt
h
of structure vi
e
wer image icon
s
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbero
u
se
a
J
Face Resour
c
eMa
n
ager t
o
handle images
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbero
potential fix for StackO
v
erflow on win32 WS
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbero
make left and
r
ig
h
t d
i
rty after a copyRightToL
e
ft an
d
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
M
i
kaël
B
a
rbero
refresh structureviewer only if a diff
s
t
a
te
i
s changed
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbero
make Ab
s
tr
a
ctD
i
ffAces
s
or
implementing I
E
dita
b
leContent
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël B
a
rbero
fix w
r
ong
s
id
e
commit
|
commitdiff
|
tree
2012-08-02
Mikaë
l
Barbero
code cle
a
n up
commit
|
commitdiff
|
tree
2012-08-02
Mika
ë
l Barb
e
ro
do not
c
o
nsider
n
on-unresolv
e
d
d
iff as ch
i
ldren of
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
M
ikaël Barb
e
ro
still some r
e
factoring in content merge viewe
r
providers
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Mikaël Barbero
r
e
factoring of c
o
nt
e
nt merge v
i
ewer parts (factorizing
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Mikaël Barbero
im
p
l
ement
s
ListMergeV
i
ewer
t
o
m
er
g
e man
y
ReferenceChange
commit
|
commitdiff
|
tree
2012-07-27
Mik
a
ël Barbero
p
r
ev
e
nts NPE from f
i
ndIn
s
er
t
ionIndex() & g
e
tSourceList
.
.
.
commit
|
commitdiff
|
tree
next