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
Mik
a
ël Bar
b
ero
unlo
a
d res
o
urces
o
n dispose (prevent UML2's CacheAdapter
.
.
.
commit
|
commitdiff
|
tree
2012-09-27
M
i
kaël Barbero
pr
e
limina
r
y su
p
port of UMLDiff in
the IDE UI
commit
|
commitdiff
|
tree
2012-09-27
Mikaël Barbero
few API open
i
ng and refact
o
ri
n
g to allow e
x
t
ension
commit
|
commitdiff
|
tree
2012-09-27
M
ikaël
Barbero
f
i
x
bug
w
hi
l
e stori
n
g previo
u
s result of comparison
commit
|
commitdiff
|
tree
2012-08-31
M
i
ka
ë
l
Barbero
ad
d
itemprovider specific impl
e
m
e
n
tion for all uml
.
.
.
commit
|
commitdiff
|
tree
2012-08-31
Mikaël B
a
rbero
fix ePackage nsURI
commit
|
commitdiff
|
tree
2012-08-31
Mika
ë
l Barbero
add rcp ui featu
r
e to
updat
e
site
commit
|
commitdiff
|
tree
2012-08-31
Mik
a
ël Barbero
add rcp-ui f
e
a
t
ure to build
commit
|
commitdiff
|
tree
2012-08-31
M
i
kaël Barb
e
ro
choco, again
(
grrr)
commit
|
commitdiff
|
tree
2012-08-31
Mikaël
B
a
rber
o
c
hoco-
commit
|
commitdiff
|
tree
2012-08-31
Mik
a
ël
B
a
r
bero
move and re
f
actor me
r
ge v
i
ewer f
r
om ide
.
ui to rcp
.
ui
commit
|
commitdiff
|
tree
2012-08-30
Mikaël
B
arbero
instanceof int
e
rfac
e
instead of imp
l
;
)
commit
|
commitdiff
|
tree
2012-08-30
Mikaël Barbero
m
a
ke source
v
iewers
not e
d
itab
l
e to
avoid partial merges
commit
|
commitdiff
|
tree
2012-08-30
M
i
ka
ë
l Barbero
ha
n
dle
save on
text merge viewer
commit
|
commitdiff
|
tree
2012-08-30
M
i
kaël Barbero
remove use
l
ess @SuppressWa
r
n
i
ng
commit
|
commitdiff
|
tree
2012-08-30
Mikaë
l
Barbero
change
d
isplay of the owner
and the
f
eatur
e
of the
.
.
.
commit
|
commitdiff
|
tree
2012-08-30
Mikaë
l
Barbero
code cl
e
an
u
p
commit
|
commitdiff
|
tree
2012-08-30
Mikaël Barb
e
ro
log Thr
o
wable instead of Exception
commit
|
commitdiff
|
tree
2012-08-29
M
i
k
aë
l
Barbero
remove debug sysout
commit
|
commitdiff
|
tree
2012-08-29
M
ikaël Barbero
remove a lo
t
of usage o
f
DynamicObject
commit
|
commitdiff
|
tree
2012-08-29
Mik
a
ël Barbero
use field instead of ove
r
r
id
a
ble met
h
od
commit
|
commitdiff
|
tree
2012-08-29
Mikaël Barbero
add
composite displaying
f
eature a
n
d
owner o
f
an EObject
.
.
.
commit
|
commitdiff
|
tree
2012-08-29
Mikaël Barb
e
ro
vertic
a
l
b
ar may not available
commit
|
commitdiff
|
tree
2012-08-28
Mikaël
Barbero
do not draw a spec
i
fic item when drawing a
simple T
a
bleItem
.
.
.
commit
|
commitdiff
|
tree
2012-08-28
Mi
k
aël Barbero
add so
m
e
he
l
pful mess
a
g
e instead of dummy one
commit
|
commitdiff
|
tree
2012-08-28
Mikaël Barbero
fix text message
for diff with kind==change
commit
|
commitdiff
|
tree
2012-08-28
Mikaël Bar
b
ero
fix sync
h
ronization be
t
ween
d
iff to be merge for all
.
.
.
commit
|
commitdiff
|
tree
2012-08-28
M
i
kaël Barbero
add Reflectiv
e
ItemProvid
e
rAdapterFactor
y
an
d
commit
|
commitdiff
|
tree
2012-08-28
Mika
ë
l Barbero
fi
x
p
oten
t
ial NPE
commit
|
commitdiff
|
tree
2012-08-27
Mikaël Barb
e
ro
fix
getContainer()
a
s re
v
ealed by added test
-
- was
.
.
.
commit
|
commitdiff
|
tree
2012-08-27
Mik
a
ël B
a
rbero
move getAsList
to Ref
e
renceUtil
commit
|
commitdiff
|
tree
2012-08-27
Mi
k
aël Bar
b
er
o
few refactoring
f
or better readability
commit
|
commitdiff
|
tree
2012-08-24
Mikaël Barbero
big reva
m
p
of
the ide
.
ui
c
ode to s
u
pport some
c
orne
r
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Mik
a
ël
B
arb
e
ro
fix p
o
tential NPE in Defaul
t
EquiEngine
commit
|
commitdiff
|
tree
2012-08-23
Mikaël
B
arbe
r
o
nicer t
e
st for Feat
u
reM
a
p
commit
|
commitdiff
|
tree
2012-08-23
Mikaël Barbe
r
o
better
d
isplay te
x
t for diffe
r
ences (esp
.
for ki
n
d
.
.
.
commit
|
commitdiff
|
tree
2012-08-23
Mikaël Barbero
happy chec
k
s
tyle
commit
|
commitdiff
|
tree
2012-08-23
Mik
a
ël
B
a
r
b
e
r
o
a
dd mea
n
in
g
ful toS
t
ring()
commit
|
commitdiff
|
tree
2012-08-22
Mika
ë
l
B
arbero
remov
e
d DiffEngineT
e
st (do
u
b
l
on with Diff
U
tilTest)
commit
|
commitdiff
|
tree
2012-08-21
Mikaël B
a
rbero
use super
C
o
m
par
e
Handl
e
r
Service instead of cre
a
ti
n
g
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
M
i
k
a
ë
l
Barbero
hook d
i
sp
o
sal o
f
co
n
trol to remo
v
e list
e
n
e
rs
commit
|
commitdiff
|
tree
2012-08-21
Mikaël
B
arb
e
r
o
h
andle all difference kin
d
s and
not o
n
ly
R
e
f
erenceChange
commit
|
commitdiff
|
tree
2012-08-21
Mika
ë
l
B
a
r
b
ero
add r
e
fr
e
s
h on ch
a
n
ge of comm
a
n
dStack
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Barbero
ov
e
r
r
ide canExecute in
m
er
g
e commands
commit
|
commitdiff
|
tree
2012-08-21
M
i
kaël Barbero
hand
l
e re
m
oving of CommandSt
a
c
k
Listener on di
s
p
o
sal
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Barbero
fix NPE when
changing from EMFCompareTextM
e
r
geV
i
ewer
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mikaël B
a
rbero
do not try
t
o resolve resource
s
from
l
oca
l
Resourc
e
S
et
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Bar
b
ero
add prelimi
n
ary sup
p
o
r
t for
undo
r
edo in te
x
t
m
e
r
ge
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
Mikaël Barbero
handle undo/redo on copy
a
ll n
o
n conflictin
g
a
cti
o
n
commit
|
commitdiff
|
tree
2012-08-20
Mikaël Barbero
add
p
rel
i
minar
y
suppo
r
t for IStrea
m
C
o
ntentAccessor
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
Mikaël Barbero
rename
d
v
ariab
l
e
commit
|
commitdiff
|
tree
2012-08-20
Mika
ë
l B
a
r
bero
fix issue with displayed
i
nsertion
p
oints (was not
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
M
i
k
aël Barbero
d
i
s
p
lay merged and
di
s
c
a
r
ded diff with a grey font
commit
|
commitdiff
|
tree
2012-08-20
Mikaël
Barbero
d
isplay proxy with i
t
alic font
commit
|
commitdiff
|
tree
2012-08-13
M
i
k
a
ël Barbero
add
p
reliminar
y
support of undo/redo
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barb
e
ro
chan
g
e c
o
ntract of Compariso
n
#getDifferences(EObject
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
Mikaël B
a
rbero
happy
c
hec
k
style
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barbero
change DiffCro
s
sR
e
f
e
rencer to ha
n
d
le subclasses of
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
M
ikaël
Barbero
some refactorin
g
to
mak
e
t
he code clearer
commit
|
commitdiff
|
tree
2012-08-10
Mikaë
l
Barbero
s
e
tThre
e
W
ay
s
hould be ca
l
l as ea
r
ly as
possible (
t
est
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
M
ikaël Barber
o
add lines between d
i
f
fs
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barbe
r
o
use clie
n
t area
instead of bounds
o
f
the
Tab
l
e
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Ba
r
bero
fix clipping area issue
o
n
wind
o
w
s
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbero
add uml2
.
id
e
.
ui
commit
|
commitdiff
|
tree
2012-08-09
Mika
ë
l
Barbe
r
o
a
dd new um
l
2
.
ide
.
ui plugin to spe
c
ialize UI
commit
|
commitdiff
|
tree
2012-08-09
Mi
k
aël Barb
e
r
o
ad
d
specif
i
c mehtods for
c
o
n
t
ent providers
commit
|
commitdiff
|
tree
2012-08-09
Mik
a
ël Barbe
r
o
change how
g
r
ou
p
s are handled: n
o
more adaptation to
.
.
.
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbero
add speci
f
ic
T
extMergeViewer to remove support
f
or
.
.
.
commit
|
commitdiff
|
tree
2012-08-09
Mi
k
aël Barbero
f
il
t
er out diff
r
efined
by
or req
u
i
red by refines by
commit
|
commitdiff
|
tree
2012-08-09
M
i
kaël Barbero
add
e
d c
r
oss r
e
f
e
renc
e
differen
c
es on Comparis
o
n#getDifferenc
.
.
.
commit
|
commitdiff
|
tree
2012-08-08
Mik
a
ël
Barbero
add eRefere
n
ce reference on UMLDif
f
EClass
commit
|
commitdiff
|
tree
2012-08-07
Mikaël Barber
o
fix adapter factory & epacka
g
e uri afte
r
refactoring
commit
|
commitdiff
|
tree
2012-08-07
Mikaë
l
B
arbero
s
o
me refactorin
g
in U
M
L co
m
pare exten
s
i
o
n
commit
|
commitdiff
|
tree
2012-08-06
Mika
ë
l Barbero
r
e
moved u
n
used merge way ti
p
action
commit
|
commitdiff
|
tree
2012-08-03
Mikaël
B
arbero
a
dd m
e
rge all non conflicting di
f
fs f
r
om
one side
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mi
k
aël Barb
e
ro
add custom MergeViewerContentProvider to handle save
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mik
a
ël Barbero
do
n
ot p
r
ovide overl
a
y
i
m
a
g
e for match wi
t
h
incoming
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
M
i
k
aël
B
arbero
ad
d
a
l
og(E
x
ception) metho
d
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
depend
o
nly on j
u
no & orbit updat
e
site
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Ba
r
bero
ad
d
a EMFCompareConfigura
t
i
o
n cla
s
s to confi
g
ure the
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
M
ikaël Barbero
move
e
ve
r
y class
e
s from
ide
.
ui bundle
into x-inte
r
nal
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
M
i
kaël B
a
rbe
r
o
p
rint out conflicts too
commit
|
commitdiff
|
tree
2012-08-03
Mi
k
aël Barbero
fail fast
on null argument
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
f
ix merge UI
a
ction
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbe
r
o
fix merge
U
I action
commit
|
commitdiff
|
tree
2012-08-03
Mikaël B
a
rb
e
r
o
ref
a
ctor & fix
g
e
tChildr
e
n f
o
r
M
atch and
R
efere
n
ceCh
a
nge
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mi
k
aël B
a
rbero
fix de
s
ynchro
for Attri
b
ute
C
ha
n
ge with ancestor
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Ba
r
b
e
ro
add
c
ons
t
ant f
o
r width
o
f s
t
ru
c
t
u
re
viewer
image
icons
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mik
a
ël
B
ar
b
ero
use
a
JFace
ResourceManager
to handle images
commit
|
commitdiff
|
tree
2012-08-02
M
i
k
aël Barbero
potenti
a
l fix for StackO
v
erflow on win32 WS
commit
|
commitdiff
|
tree
2012-08-02
Mikaël
Barber
o
m
ake left a
n
d
right dirt
y
a
fter a copyRigh
t
ToLeft and
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbero
refr
e
sh structureviewer
o
nly if a diff st
a
te is change
d
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbero
make Ab
s
tractDiffAcessor implementing IEditab
l
eContent
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Bar
b
ero
fix wron
g
side
commit
|
commitdiff
|
tree
2012-08-02
Mi
k
aël Bar
b
ero
co
d
e c
l
ean up
commit
|
commitdiff
|
tree
2012-08-02
M
i
ka
ë
l
Barb
e
r
o
d
o
not cons
i
der non-unresol
v
ed diff
as child
r
en of
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Mikaël Barbero
s
t
ill some refactorin
g
i
n
c
ontent merg
e
vi
e
wer
providers
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Mikaël Barb
e
ro
r
e
factoring of c
o
ntent merge viewer parts
(facto
r
i
z
ing
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Mikaël Barbero
implement
s
ListMergeVi
e
wer to m
e
rge
m
any R
e
ferenceChange
commit
|
commitdiff
|
tree
2012-07-27
Mikaël Barbe
r
o
preven
t
s
NPE from findIn
s
erti
o
nIndex() & ge
t
SourceList
.
.
.
commit
|
commitdiff
|
tree
next