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
make source viewers not editable to avoid partial merges
2012-08-30
Mikaël Barbero
make
s
ource vie
w
ers not editabl
e
to avoi
d
par
t
ial
m
erges
commit
|
commitdiff
|
tree
2012-08-30
Mikaël
B
arbero
handle save on text merge viewer
commit
|
commitdiff
|
tree
2012-08-30
Mi
k
aël Barber
o
r
e
m
ove useless @Suppres
s
Warning
commit
|
commitdiff
|
tree
2012-08-30
Mikaël Barbero
c
hange display of the owner and t
h
e feature o
f
the
.
.
.
commit
|
commitdiff
|
tree
2012-08-30
Mikaël Ba
r
be
r
o
code clean
u
p
commit
|
commitdiff
|
tree
2012-08-30
Mikaël B
a
r
bero
l
o
g Th
r
owable instead of Exce
p
ti
o
n
commit
|
commitdiff
|
tree
2012-08-29
M
ikaël
B
arbero
remove debug s
y
sou
t
commit
|
commitdiff
|
tree
2012-08-29
Mik
a
ël B
a
rbero
remove a lo
t
of usage
o
f Dyn
a
micObject
commit
|
commitdiff
|
tree
2012-08-29
M
ikaël Barbero
use field instead o
f
overridable method
commit
|
commitdiff
|
tree
2012-08-29
Mikaë
l
Barbero
add
composite displaying f
e
a
t
ure and o
w
ner of
an EObjec
t
.
.
.
commit
|
commitdiff
|
tree
2012-08-29
M
i
kaël Barbero
ve
r
tica
l
bar m
a
y
not ava
i
lable
commit
|
commitdiff
|
tree
2012-08-28
Mikaël Barbero
do not draw
a
specific item
w
hen drawing a
simpl
e
TableIt
e
m
.
.
.
commit
|
commitdiff
|
tree
2012-08-28
Mika
ë
l B
a
r
b
ero
add s
o
me
helpful mes
s
age in
s
te
a
d of dummy one
commit
|
commitdiff
|
tree
2012-08-28
Mikaël
Barbero
f
i
x t
e
xt m
e
ss
a
ge for di
f
f with k
i
nd
=
=
c
h
a
nge
commit
|
commitdiff
|
tree
2012-08-28
M
ikaël Barbero
fix synchronization b
e
t
ween diff to
be m
e
rge f
o
r
all
.
.
.
commit
|
commitdiff
|
tree
2012-08-28
Mik
a
ël Barbero
add ReflectiveI
t
emProvide
r
A
dapterF
a
ct
o
ry and
commit
|
commitdiff
|
tree
2012-08-28
Mikaël Barbero
fi
x
poten
t
ial NPE
commit
|
commitdiff
|
tree
2012-08-27
M
i
kaël Barbero
fix
ge
t
Container() as revea
l
ed by
a
dded t
e
s
t
-
-
w
as
.
.
.
commit
|
commitdiff
|
tree
2012-08-27
Mikaël Barbero
mov
e
getAsList to ReferenceU
t
il
commit
|
commitdiff
|
tree
2012-08-27
Mikaël Barbero
few re
f
actoring for
bet
t
er readabil
i
ty
commit
|
commitdiff
|
tree
2012-08-24
Mikaël Barbero
big
revamp of the ide
.
u
i
c
ode
to supp
o
rt some corn
e
r
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Mi
k
aël Barbe
r
o
fix potentia
l
N
PE
i
n
Defau
l
tEquiEngine
commit
|
commitdiff
|
tree
2012-08-23
M
ikaël
B
arber
o
nice
r
test for FeatureMap
commit
|
commitdiff
|
tree
2012-08-23
Mikaël Barbero
bett
e
r disp
l
ay
t
ext for differenc
e
s
(esp
.
f
o
r
k
ind
.
.
.
commit
|
commitdiff
|
tree
2012-08-23
Mikaël Barbero
happy checkst
y
le
commit
|
commitdiff
|
tree
2012-08-23
Mika
ë
l Barbero
ad
d
m
eaning
f
ul t
o
S
tring()
commit
|
commitdiff
|
tree
2012-08-22
Mikaël Barbero
removed
DiffEngineTest (do
u
blon w
i
th DiffUtilTest)
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Barbero
use super Compare
H
andlerService instead
of creat
i
ng
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mika
ë
l
B
arber
o
hook disposal o
f
control to
remove listen
e
rs
commit
|
commitdiff
|
tree
2012-08-21
M
i
kaël Barbero
handle all diff
e
ren
c
e kind
s
and not only R
e
fere
n
c
e
Ch
a
nge
commit
|
commitdiff
|
tree
2012-08-21
M
ikaël Barbero
add
r
efresh on ch
a
ng
e
of comman
d
S
tack
commit
|
commitdiff
|
tree
2012-08-21
Mik
a
ël
B
arbero
overrid
e
c
a
nExecu
t
e in merge c
o
mmands
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Bar
b
ero
handl
e
removing of CommandStackListener
on disp
o
sal
commit
|
commitdiff
|
tree
2012-08-21
Mikaël
B
arbero
fix NP
E
when changing from EMFC
o
mp
a
reTextMergeVi
e
wer
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mi
k
aël Barber
o
d
o n
o
t try
to res
o
lve
r
esou
r
ces
f
r
om
loca
l
Res
o
urceSe
t
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Barb
e
ro
a
d
d preliminary support for undo
r
edo in
t
ext merge
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
M
ikaël
B
arbero
handle
undo/redo on co
p
y a
l
l non
c
onflicting ac
t
ion
commit
|
commitdiff
|
tree
2012-08-20
Mikaë
l
Barbero
add p
r
eliminary support
f
or IStreamContentAccess
o
r
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
M
i
kaël Barbero
r
e
named variable
commit
|
commitdiff
|
tree
2012-08-20
Mikaël Barbero
fix is
s
ue with di
s
played insertion points
(was not
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
Mikaël Barbero
di
s
pla
y
merged an
d
d
isca
r
ded
diff
w
i
th a grey font
commit
|
commitdiff
|
tree
2012-08-20
Mikaël Barbero
disp
l
ay prox
y
with ital
i
c
f
ont
commit
|
commitdiff
|
tree
2012-08-13
M
i
kaë
l
Barbero
add p
r
el
i
minar
y
suppo
r
t of undo/redo
commit
|
commitdiff
|
tree
2012-08-10
Mikaël
Barbero
c
ha
n
ge contract of Comp
a
riso
n
#g
e
t
Differences(EObject
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
M
i
kaël Barb
e
ro
happy checkstyle
commit
|
commitdiff
|
tree
2012-08-10
Mi
k
aël Barbero
ch
a
nge Diff
C
ros
s
Re
f
erencer to h
a
ndle subcl
a
sses of
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barb
e
ro
s
o
me refactoring to
m
a
k
e
th
e
code
c
lear
e
r
commit
|
commitdiff
|
tree
2012-08-10
Mikaë
l
Ba
r
bero
setTh
r
e
eWay should be
c
a
l
l as early as possible (test
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
Mik
a
ë
l Barbero
add lines between diffs
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barb
e
ro
u
s
e
client area instead of
bounds of th
e
Table
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barbero
fix clipping ar
e
a issu
e
on windows
commit
|
commitdiff
|
tree
2012-08-09
Mi
k
a
ë
l
B
arbero
add uml2
.
ide
.
ui
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barb
e
ro
add new uml2
.
ide
.
ui plugin to speci
a
lize UI
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbero
add spec
i
fic mehtods for
co
n
t
ent providers
commit
|
commitdiff
|
tree
2012-08-09
Mikaël B
a
rbero
change how groups ar
e
handled: no more
adap
t
ation to
.
.
.
commit
|
commitdiff
|
tree
2012-08-09
Mikaël
Ba
r
bero
add spe
c
ific TextMergeView
e
r to
r
e
m
ove support
f
or
.
.
.
commit
|
commitdiff
|
tree
2012-08-09
Mikaë
l
Barbero
fi
l
ter out diff refined
b
y
or required by refines by
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbero
ad
d
ed cro
s
s
r
eference differe
n
ces on
Compar
i
son#getDif
f
e
r
enc
.
.
.
commit
|
commitdiff
|
tree
2012-08-08
M
i
k
a
ël Barbero
a
dd eReference reference on U
M
LDiff EClass
commit
|
commitdiff
|
tree
2012-08-07
Mikaël Bar
b
ero
fi
x
ad
a
pter
factory &
epackage uri after re
f
actoring
commit
|
commitdiff
|
tree
2012-08-07
Mikaël Barbero
so
m
e
refac
t
o
ring in UML
compar
e
extensio
n
commit
|
commitdiff
|
tree
2012-08-06
Mikaë
l
Ba
r
bero
removed
unused merge way
t
ip action
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
add mer
g
e
all
non
conflicting diffs from
o
ne
s
ide t
o
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
M
i
kaël B
a
rbero
a
dd custom MergeViewerContentPr
o
vi
d
er to handle save
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mika
ë
l Barber
o
do no
t
pro
v
id
e
overlay i
m
age for match
with
i
ncoming
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
M
ikaël Barbero
add a log(Ex
c
eption) method
commit
|
commitdiff
|
tree
2012-08-03
Mikaë
l
Barber
o
depend only on
juno
&
orbi
t
update site
commit
|
commitdiff
|
tree
2012-08-03
Mikaël B
a
r
b
e
ro
add
a
EMFCompareC
o
n
f
i
g
ur
a
t
io
n
class t
o
confi
g
u
re the
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
mo
v
e every classes f
r
o
m
i
d
e
.
ui
b
undl
e
into x-int
e
rnal
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mi
k
aël Barbero
print out conflicts
t
oo
commit
|
commitdiff
|
tree
2012-08-03
M
ikaël Barbero
f
ail fast on null argu
m
ent
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
fix merge UI acti
o
n
commit
|
commitdiff
|
tree
2012-08-03
M
i
k
aël Barbero
fix merg
e
UI action
commit
|
commitdiff
|
tree
2012-08-03
Mik
a
ë
l
Barbero
refactor
&
fix getChildr
e
n for Match and ReferenceChange
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbero
fix desynchro for
AttributeChange wit
h
ancestor
commit
|
commitdiff
|
tree
2012-08-02
M
ikaël Barbero
add
cons
t
ant for width o
f
s
t
r
u
cture viewe
r
image i
c
ons
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbero
u
s
e a JFace ResourceManager to
handl
e
i
mage
s
commit
|
commitdiff
|
tree
2012-08-02
Mikaë
l
Bar
b
ero
potentia
l
f
ix
for St
a
ckOverflow
on win32 WS
commit
|
commitdiff
|
tree
2012-08-02
Mika
ë
l Barbero
make left a
n
d
r
ight dirt
y
af
t
er a copyR
i
ghtToLeft and
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barber
o
refresh structur
e
v
i
ewer only if
a diff state
i
s
changed
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mikaël Barbero
ma
k
e A
b
strac
t
Di
f
f
Acess
o
r im
p
l
emen
t
i
n
g IEdita
b
leContent
.
.
.
commit
|
commitdiff
|
tree
2012-08-02
Mi
k
a
ë
l Barbero
fix wrong
s
ide
commit
|
commitdiff
|
tree
2012-08-02
M
ika
ë
l Barbero
code cle
a
n
u
p
commit
|
commitdiff
|
tree
2012-08-02
Mikaël
B
a
rbero
do
not c
o
nsider non
-
unresolved d
i
ff as children of
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
M
i
k
aël Barbero
s
t
ill som
e
re
f
actoring in
c
ontent merge viewer p
r
o
v
id
e
rs
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Mi
k
aël Barbe
r
o
refactoring of content merge viewer p
a
rts (factorizi
n
g
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Mikaël
B
arbero
imple
m
ents
L
i
st
M
ergeView
e
r t
o
mer
g
e many ReferenceCha
n
ge
commit
|
commitdiff
|
tree
2012-07-27
Mik
a
ë
l
Barbero
pre
v
en
t
s NPE from find
I
n
s
e
r
tionIndex
(
) & getSource
L
ist
.
.
.
commit
|
commitdiff
|
tree
2012-07-19
Mikaë
l
Barbero
change
t
he MatchI
t
e
mProvider t
h
at give containment
.
.
.
commit
|
commitdiff
|
tree
2012-07-17
Mikaël Barbe
r
o
hide pseudo
c
onflicts
commit
|
commitdiff
|
tree
2012-07-17
Mik
a
ël Barbero
another step toward
t
he ne
w
implem
e
ntation
of the
EMFCompare
.
.
.
commit
|
commitdiff
|
tree
2012-07-13
Mik
a
ël Barbero
updat
e
for
4
.
2 release
commit
|
commitdiff
|
tree
2012-06-27
Mik
a
ël Ba
r
bero
a
d
ded null test against no match
f
ound
commit
|
commitdiff
|
tree
2012-06-27
Mikaël
B
a
rbero
removed reference t
o
o
.
e
.
compare interna
l
c
o
de
commit
|
commitdiff
|
tree
2012-06-27
Mikaë
l
Barbero
fix
p
oten
t
ial NPE
commit
|
commitdiff
|
tree
2012-06-04
Mik
a
ë
l Barbero
a
d
d
ed content merge vi
e
w
e
r for many ref
e
rence changes
commit
|
commitdiff
|
tree
2012-06-04
M
ikaë
l
Barbero
filte
r
s out root matches with no diff
commit
|
commitdiff
|
tree
2012-05-31
Mikaël
B
a
r
bero
add con
s
i
st
e
ncy in markers
d
isplayed in the UI
commit
|
commitdiff
|
tree
2012-05-31
Mikaël Barbero
added Arrays
.
fill()in
g
of b
l
ank space
commit
|
commitdiff
|
tree
2012-05-04
M
i
kaël
Barb
e
ro
add get
A
llSubmatches(
)
and getAllDifference
s
() EOper
a
tions
.
.
.
commit
|
commitdiff
|
tree
next