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
use field instead of overridable method
2012-08-29
Mikaël B
a
r
b
er
o
us
e
field i
n
stead of o
v
erridable method
commit
|
commitdiff
|
tree
2012-08-29
Mikaë
l
Barbero
add composite d
i
s
playing feature a
n
d owner of an EObj
e
ct
.
.
.
commit
|
commitdiff
|
tree
2012-08-29
Mikaël Barbero
ver
t
ical bar may not available
commit
|
commitdiff
|
tree
2012-08-28
M
ik
a
ël Barbero
do not draw a specific item
when drawin
g
a simple Tab
l
e
Item
.
.
.
commit
|
commitdiff
|
tree
2012-08-28
Mi
k
aël Barb
e
ro
add
s
om
e
helpful messag
e
in
s
tead of dummy one
commit
|
commitdiff
|
tree
2012-08-28
Mika
ë
l B
a
r
bero
f
i
x
t
ext me
s
sage for d
i
ff with kind==change
commit
|
commitdiff
|
tree
2012-08-28
Mikaël Barb
e
ro
f
i
x
s
ync
h
ronization between diff
t
o b
e
merge for all
.
.
.
commit
|
commitdiff
|
tree
2012-08-28
Mikaël Barbero
add ReflectiveItemP
r
ovi
d
erAdapt
e
rFac
t
ory and
commit
|
commitdiff
|
tree
2012-08-28
Mikaël
B
a
rbero
fix potentia
l
NPE
commit
|
commitdiff
|
tree
2012-08-27
Mik
a
ël Barbero
fi
x
g
etCon
t
ainer() as revealed by
added
test -- w
a
s
.
.
.
commit
|
commitdiff
|
tree
2012-08-27
Mikaë
l
Barbero
m
ove
g
e
t
AsList
t
o R
e
ferenceUtil
commit
|
commitdiff
|
tree
2012-08-27
Mikaël Barbero
few r
e
f
actoring for bett
e
r readabili
t
y
commit
|
commitdiff
|
tree
2012-08-24
Mikaël Ba
r
bero
big rev
a
m
p
of
t
he ide
.
ui code
to s
u
ppor
t
s
ome corner
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
M
ikaël Ba
r
bero
fix potentia
l
NPE
i
n Defau
l
t
Eq
u
iEngine
commit
|
commitdiff
|
tree
2012-08-23
Mikaël Ba
r
bero
n
i
cer t
e
st
f
o
r Feature
M
ap
commit
|
commitdiff
|
tree
2012-08-23
Mika
ë
l Barbero
b
etter display text for differenc
e
s
(
e
sp
.
f
o
r kind
.
.
.
commit
|
commitdiff
|
tree
2012-08-23
Mikaël
B
a
rbero
ha
p
py ch
e
ckstyle
commit
|
commitdiff
|
tree
2012-08-23
M
ikaël Barbero
add
m
e
aningful toString()
commit
|
commitdiff
|
tree
2012-08-22
Mikaël Barbero
rem
o
ved Di
f
f
Eng
i
n
eTest (
d
o
ublon wit
h
DiffUtilTest)
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Ba
r
bero
use s
u
p
er Compar
e
HandlerService instead of creating
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Barbero
h
oo
k
disposa
l
of contro
l
t
o
remove lis
t
eners
commit
|
commitdiff
|
tree
2012-08-21
Mikaë
l
Barbero
h
a
n
d
le al
l
diffe
r
enc
e
k
i
n
ds
a
n
d not only
Refe
r
ence
C
hange
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Barbero
add refresh on change of commandStac
k
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Barbero
over
r
id
e
canExec
u
te in
merge commands
commit
|
commitdiff
|
tree
2012-08-21
M
i
kaël Barbero
ha
n
dle
r
e
moving of
C
ommandStackLi
s
t
ener on
d
isp
o
s
a
l
commit
|
commitdiff
|
tree
2012-08-21
Mika
ë
l Bar
b
ero
f
ix N
P
E
w
hen
cha
n
g
i
ng from EMFCompare
T
extMergeVi
e
wer
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Barbero
do no
t
tr
y
t
o
resolve resources fr
o
m
l
o
c
alResourceSet
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mi
k
aël B
a
rbero
add preliminary support f
o
r undo redo
i
n te
x
t m
e
rge
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
Mikaël Ba
r
bero
handle undo/redo on copy all no
n
conflic
t
ing action
commit
|
commitdiff
|
tree
2012-08-20
Mikaël Bar
b
er
o
add preliminary
s
upport
for IStream
C
onten
t
Accessor
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
Mikaël B
a
rbero
renamed
v
ar
i
abl
e
commit
|
commitdiff
|
tree
2012-08-20
Mi
k
a
ë
l Barbero
fi
x
issu
e
with displayed insertion po
i
nts (was not
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
Mikaël Barbero
display merged and
discarded di
f
f with
a
grey font
commit
|
commitdiff
|
tree
2012-08-20
Mikaël
B
arb
e
r
o
display pro
x
y with italic font
commit
|
commitdiff
|
tree
2012-08-13
Mikaël Barbero
add preliminary su
p
port of undo/redo
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barbero
chang
e
contract of Comparison#getDi
f
ferences
(
EObject
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barbero
happy check
s
tyle
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Bar
b
ero
change DiffCrossRefer
e
ncer to hand
l
e subc
l
asses of
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barbero
s
o
me re
f
act
o
ring to m
a
k
e th
e
co
d
e
c
learer
commit
|
commitdiff
|
tree
2012-08-10
M
ikaël
Barbero
s
etThreeWay should be call as
early
as po
s
s
i
ble (test
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
Mik
a
ël Bar
b
ero
add
l
ines between diffs
commit
|
commitdiff
|
tree
2012-08-10
Mikaël
B
arb
e
r
o
use
clien
t
a
rea
inst
e
ad of
bounds of the Table
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barbe
r
o
fix clipping a
r
e
a
i
ssue on windows
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbero
add u
m
l2
.
i
d
e
.
ui
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbe
r
o
a
d
d new uml2
.
ide
.
ui plugin to
s
pecialize UI
commit
|
commitdiff
|
tree
2012-08-09
M
i
kaël Barber
o
a
d
d specific mehtods
f
o
r
c
onte
n
t providers
commit
|
commitdiff
|
tree
2012-08-09
Mik
a
ël Barbero
c
h
a
nge how gro
u
ps are handle
d
:
no more adaptatio
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-08-09
Mi
k
aë
l
B
arbero
add specific Te
x
tM
e
r
geVi
e
wer to
r
e
mov
e
s
u
pport for
.
.
.
commit
|
commitdiff
|
tree
2012-08-09
Mikaël B
a
rbero
filter out diff refined by or required
b
y refines by
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbero
a
d
ded cr
o
ss reference difference
s
on Comparison#ge
t
Di
f
fer
e
nc
.
.
.
commit
|
commitdiff
|
tree
2012-08-08
M
i
kaël B
a
rbero
add
e
Refere
n
ce reference
o
n U
M
L
Diff EClass
commit
|
commitdiff
|
tree
2012-08-07
Mikaël Ba
r
b
ero
f
i
x
adapter factory & e
p
ackag
e
ur
i
af
t
er refactoring
commit
|
commitdiff
|
tree
2012-08-07
Mikaël Barbero
some
refactoring in UML comp
a
re extension
commit
|
commitdiff
|
tree
2012-08-06
Mikaël
B
a
r
bero
removed unus
e
d merge way tip action
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
add
mer
g
e a
l
l non conflict
i
ng di
f
fs fr
o
m one side to
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Ba
r
bero
a
d
d custo
m
M
ergeViewerContentProvider to
handle
s
ave
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
do not
p
r
ovide
o
verlay image
f
or m
a
tch wi
t
h incomin
g
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mi
k
a
ël B
a
rber
o
add a lo
g
(Exce
p
tion
)
met
h
od
commit
|
commitdiff
|
tree
2012-08-03
Mikaël
Barb
e
ro
depend only on
j
u
no & orbit update site
commit
|
commitdiff
|
tree
2012-08-03
Mikaël
B
a
rbero
add a EMFCompareConfigu
r
ation cl
a
ss to c
o
nfig
u
r
e the
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
M
i
kaël
B
arbero
move eve
r
y classes from ide
.
ui bundl
e
i
n
t
o
x-internal
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barb
e
ro
print out confl
i
cts too
commit
|
commitdiff
|
tree
2012-08-03
M
ikaë
l
Barbero
fail fast on null argument
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
fix merge
UI action
commit
|
commitdiff
|
tree
2012-08-03
M
ikaël Ba
r
bero
fix
merge UI action
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barber
o
refa
c
tor & fi
x
getChildren f
o
r
Ma
t
ch and Referen
c
eChange
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
M
ikaël Barbero
fix de
s
ynchro fo
r
Attrib
u
teCh
a
nge with an
c
estor
commit
|
commitdiff
|
tree
2012-08-02
M
i
kaë
l
Barb
e
ro
add constant for wid
t
h
of structure viewe
r
image
i
cons
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mika
ë
l Barbero
use
a JFace ResourceMan
a
ger to
handle i
m
ag
e
s
commit
|
commitdiff
|
tree
2012-08-02
Mikaël
Ba
r
bero
potential fix f
o
r
Stack
O
verflow
o
n win32 WS
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbero
make
l
eft and right dir
t
y
after a cop
y
RightToLeft an
d
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël
Bar
b
ero
refres
h
structureviewer only if a d
i
ff state is c
h
a
n
g
e
d
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbero
make A
b
stra
c
tDiffAces
s
or imp
l
e
menting IEditableConte
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbero
fix wrong side
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbe
r
o
code
c
lean up
commit
|
commitdiff
|
tree
2012-08-02
Mika
ë
l Bar
b
ero
do n
o
t con
s
ider non-unr
e
solved
d
iff as
c
hi
l
dren of
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Mikaël Barbero
still some refactoring in
content merge v
i
ewer p
r
oviders
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
M
i
kaël Barbero
ref
a
cto
r
i
ng o
f
content merge viewer part
s
(f
a
ctorizing
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Mikaë
l
B
arbero
implements ListMergeVi
e
wer t
o
merge many R
e
fer
e
n
c
e
C
han
g
e
commit
|
commitdiff
|
tree
2012-07-27
Mikaël Barbero
preve
n
ts NPE from
find
I
n
s
ertionIndex()
&
g
etSour
c
eList
.
.
.
commit
|
commitdiff
|
tree
2012-07-19
M
ik
a
ë
l
Barbe
r
o
change
the MatchI
t
emProvider
t
h
a
t give
con
t
ainmen
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-17
Mikaël Barbero
hide
pse
u
do con
f
licts
commit
|
commitdiff
|
tree
2012-07-17
Mikaël B
a
rbero
another step toward th
e
new impleme
n
tation of the EM
F
Compa
r
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-13
Mikaël
B
a
rbe
r
o
update for 4
.
2 r
e
l
e
ase
commit
|
commitdiff
|
tree
2012-06-27
Mikaël Barbe
r
o
adde
d
n
ull t
e
st ag
a
in
s
t
n
o
m
atch found
commit
|
commitdiff
|
tree
2012-06-27
Mikaël Bar
b
ero
removed refe
r
ence to o
.
e
.
compare internal code
commit
|
commitdiff
|
tree
2012-06-27
Mikaël Barbero
fix pote
n
tial NPE
commit
|
commitdiff
|
tree
2012-06-04
Mikaël Barbero
added content merg
e
viewer for m
a
ny
r
eference changes
commit
|
commitdiff
|
tree
2012-06-04
Mikaël Barbero
filters
ou
t
root
m
at
c
h
e
s with no dif
f
commit
|
commitdiff
|
tree
2012-05-31
Mikaël Barb
e
ro
a
dd co
n
sistency
in markers
d
isplayed in th
e
UI
commit
|
commitdiff
|
tree
2012-05-31
Mikaël
B
a
rbero
added
Ar
r
ays
.
fill()ing
o
f blan
k
space
commit
|
commitdiff
|
tree
2012-05-04
Mikaë
l
Barbero
add getAllSubmatches() a
n
d getAl
l
Differen
c
es() EOperations
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Mikaël Barbero
do not use
the ro
o
t adapter factory, but the prov
i
d
e
d
.
.
.
commit
|
commitdiff
|
tree
2012-04-27
Mikaël
Barbero
move interna
l
pa
c
kage
f
r
o
m org
.
ec
l
ipse
.
emf
.
compare t
o
commit
|
commitdiff
|
tree
2012-04-27
M
i
ka
ë
l B
a
rbero
rena
m
e
EObject conten
t
me
r
ge
v
iewer
commit
|
commitdiff
|
tree
2012-04-27
Mikaël Bar
b
e
r
o
re
n
ame to
make che
c
kstyle happy
commit
|
commitdiff
|
tree
2012-04-27
Mikaël Barbero
code cle
a
nin
g
commit
|
commitdiff
|
tree
2012-04-27
Mi
k
aël Barber
o
ext
r
act common code to
u
tils
m
e
thods (getTe
x
t
/ g
e
t
I
mage)
commit
|
commitdiff
|
tree
2012-04-27
Mikaël Barbe
r
o
add Match#getCompar
i
son() EOperation
commit
|
commitdiff
|
tree
2012-04-26
Mika
ë
l Barbero
extrac
t
some utils
m
e
t
h
ods i
n
CompareItemProviderSpec
.
.
.
commit
|
commitdiff
|
tree
next