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
removed @since tags since we did not decided yet if we want to include
2012-10-15
Mikaël
B
arbero
removed
@sinc
e
tags
s
i
n
c
e we did not decided yet if
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
Mikaël Ba
r
be
r
o
a
d
d Monit
o
r t
o
al
l
co
m
puti
n
g methods
.
commit
|
commitdiff
|
tree
2012-10-12
Mikaë
l
Barbero
upgrade pom
.
xm
l
, MANIFEST
.
MF
f
eatu
r
e
.
xml v
e
rsions
.
.
.
commit
|
commitdiff
|
tree
2012-10-12
Mikaël Barbero
update
m
anifest to 3
.
0
.
0
f
or com
p
ar
e
, compare
.
edit
.
.
.
commit
|
commitdiff
|
tree
2012-10-12
Mikaël Barbero
Merge branc
h
'master' into api_embe
l
li
s
hmen
t
commit
|
commitdiff
|
tree
2012-10-12
Mikaël B
a
rbero
f
ix tests
(
add pos
t
processo
r
registry to EMFCompare
.
.
.
commit
|
commitdiff
|
tree
2012-10-12
M
ik
a
ël
B
arbero
Merge br
a
n
c
h
'
mas
t
e
r' int
o
api_embellishme
n
t
commit
|
commitdiff
|
tree
2012-10-12
Mikaël Barbero
unlo
a
d re
s
ources on dispo
s
e (prev
e
nt U
M
L2's
CacheAdapter
.
.
.
commit
|
commitdiff
|
tree
2012-10-10
Mi
k
a
ël Barbero
ove
r
rid
e
isAdapterFor
T
ype to avoid recreation of the
.
.
.
commit
|
commitdiff
|
tree
2012-10-09
Mi
k
aël
Barbero
Merge branch 'master'
into api_embellishment
commit
|
commitdiff
|
tree
2012-10-09
Mikaël Barbero
c
hange
c
onfusi
n
g
method
s
n
ame
commit
|
commitdiff
|
tree
2012-10-09
Mi
k
aël Barbero
use a EO
b
ject t
o
U
RI cache with ma
x
s
i
ze instead
of
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
M
ikaë
l
Barbe
r
o
Merge bra
n
c
h
'master'
into
a
pi_embelli
s
h
m
ent
commit
|
commitdiff
|
tree
2012-10-05
Mikaël Barbero
M
e
r
g
e
b
ranch 'mas
t
er' i
n
to api_embellishme
n
t
commit
|
commitdiff
|
tree
2012-10-05
Mika
ë
l
Barbe
r
o
M
e
r
ge branch 'master' in
t
o api_embellishment
commit
|
commitdiff
|
tree
2012-10-05
Mikaël
B
arbero
set the
EO
b
j
e
ct to U
R
I cache to use weak
keys
commit
|
commitdiff
|
tree
2012-10-04
Mikaël Barbero
happy
c
heckstyle (javadoc)
commit
|
commitdiff
|
tree
2012-10-04
Mikaël
B
arbero
Mer
g
e branch '
m
a
s
ter' into api_embellishment
commit
|
commitdiff
|
tree
2012-10-04
Mikaël Ba
r
bero
API
embe
l
lishment
commit
|
commitdiff
|
tree
2012-09-27
Mikaë
l
Barbero
preliminary
s
upport of UMLDiff
in the IDE UI
commit
|
commitdiff
|
tree
2012-09-27
Mikaë
l
Barbero
fe
w
API
o
pening a
n
d ref
a
c
t
o
ring to allow exte
n
s
i
o
n
commit
|
commitdiff
|
tree
2012-09-27
Mi
k
a
ël Barbe
r
o
fix bug while stor
i
ng previous res
u
lt of comp
a
rison
commit
|
commitdiff
|
tree
2012-08-31
Mi
k
a
ë
l Barbero
add ite
m
provider specific imple
m
ention for all uml
.
.
.
commit
|
commitdiff
|
tree
2012-08-31
M
ikaël Ba
r
ber
o
fix
e
Package nsURI
commit
|
commitdiff
|
tree
2012-08-31
Mikaël Barbero
ad
d
rcp ui feature to u
p
date site
commit
|
commitdiff
|
tree
2012-08-31
Mika
ë
l Barber
o
add rcp
-
ui feature to
build
commit
|
commitdiff
|
tree
2012-08-31
Mikaël
Barber
o
choc
o
, again (grrr)
commit
|
commitdiff
|
tree
2012-08-31
Mika
ë
l Barbero
c
h
oco-
commit
|
commitdiff
|
tree
2012-08-31
Mikaël Barbero
move
a
nd refacto
r
m
e
rge v
i
ewer fr
o
m i
d
e
.
ui to rcp
.
ui
commit
|
commitdiff
|
tree
2012-08-30
Mik
a
ël Bar
b
ero
ins
t
anceo
f
int
e
rface inst
e
ad
o
f impl ;)
commit
|
commitdiff
|
tree
2012-08-30
M
i
kaël
Barbero
make source viewers not editable to avo
i
d part
i
al merges
commit
|
commitdiff
|
tree
2012-08-30
Mikaël
B
arbero
handle save on text merge
vi
e
wer
commit
|
commitdiff
|
tree
2012-08-30
Mikaë
l
B
a
rber
o
remove useless @
S
u
ppressWarning
commit
|
commitdiff
|
tree
2012-08-30
Mikaël
Barbe
r
o
change display of the owne
r
a
n
d the fe
a
t
u
r
e
o
f
t
h
e
.
.
.
commit
|
commitdiff
|
tree
2012-08-30
Mikaël B
a
rbero
cod
e
cleanup
commit
|
commitdiff
|
tree
2012-08-30
M
ikaël
B
ar
b
ero
log Throwa
b
le
instead o
f
Excepti
o
n
commit
|
commitdiff
|
tree
2012-08-29
Mika
ë
l Barbero
remove debug
sysout
commit
|
commitdiff
|
tree
2012-08-29
Mikaël
B
arbero
rem
o
ve a
lot of
usage
o
f Dy
n
amicObject
commit
|
commitdiff
|
tree
2012-08-29
M
i
kaël B
a
rbero
use f
i
eld instead of o
v
errida
b
le method
commit
|
commitdiff
|
tree
2012-08-29
Mikaël B
a
rbero
add com
p
osi
t
e displaying
featur
e
and own
e
r of an EObject
.
.
.
commit
|
commitdiff
|
tree
2012-08-29
M
i
kaël Barbero
vertical
b
a
r
m
a
y
not a
v
ailable
commit
|
commitdiff
|
tree
2012-08-28
M
i
kaë
l
B
arber
o
do not draw a specifi
c
item when dra
w
ing a
s
i
mple Ta
b
leItem
.
.
.
commit
|
commitdiff
|
tree
2012-08-28
Mikaël Ba
r
bero
ad
d
some h
e
lp
f
ul mess
a
ge instea
d
of dummy one
commit
|
commitdiff
|
tree
2012-08-28
Mikaël
Bar
b
ero
fix t
e
xt m
e
ssage for diff with kind==change
commit
|
commitdiff
|
tree
2012-08-28
M
i
k
aël Bar
b
ero
fix synchronization between
diff to be merge for all
.
.
.
commit
|
commitdiff
|
tree
2012-08-28
Mikaë
l
Barb
e
ro
a
d
d Reflect
i
veItemProviderAd
a
pterFa
c
tory and
commit
|
commitdiff
|
tree
2012-08-28
M
ikaël
B
a
rbero
fix p
o
tential NPE
commit
|
commitdiff
|
tree
2012-08-27
Mikaël Barbero
fix getContain
e
r() as
r
evea
l
ed by added test -- was
.
.
.
commit
|
commitdiff
|
tree
2012-08-27
M
i
kaël
Barber
o
mo
v
e getAsList to
R
ef
e
r
e
nceUt
i
l
commit
|
commitdiff
|
tree
2012-08-27
Mikaël Ba
r
bero
few r
e
factoring for bett
e
r read
a
bili
t
y
commit
|
commitdiff
|
tree
2012-08-24
Mikaël Ba
r
bero
big
r
e
vamp of t
h
e ide
.
ui code to support some corner
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Mi
k
aël Barber
o
fix pot
e
ntial NPE
i
n Default
E
quiEngine
commit
|
commitdiff
|
tree
2012-08-23
Mikaël
B
ar
b
e
r
o
ni
c
er test for FeatureMap
commit
|
commitdiff
|
tree
2012-08-23
Mikaël Barbero
be
t
t
er display t
e
xt for diff
e
re
n
ces (esp
.
for kin
d
.
.
.
commit
|
commitdiff
|
tree
2012-08-23
Mik
a
ël Ba
r
bero
happy
checkstyle
commit
|
commitdiff
|
tree
2012-08-23
Mikaë
l
B
ar
b
e
r
o
add meaningful toString(
)
commit
|
commitdiff
|
tree
2012-08-22
M
ikaël Barber
o
r
emo
v
ed
Dif
f
EngineTest (
d
oublo
n
with DiffUtilTes
t
)
commit
|
commitdiff
|
tree
2012-08-21
Mika
ë
l Barbero
use super C
o
mpareHandlerService instead of creating
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mikaë
l
Barbe
r
o
hook dispo
s
al
o
f contro
l
t
o
remove lis
t
eners
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Ba
r
be
r
o
handle all differen
c
e kinds
and not onl
y
ReferenceChange
commit
|
commitdiff
|
tree
2012-08-21
Mikaë
l
Ba
r
bero
add refresh o
n
change of commandSt
a
ck
commit
|
commitdiff
|
tree
2012-08-21
Mikaël Barbero
override
c
a
n
Execute in
m
erge
c
o
m
mands
commit
|
commitdiff
|
tree
2012-08-21
M
ikaël Barbero
han
d
le rem
o
v
i
ng
o
f Comman
d
S
t
ackL
i
stener on d
i
spos
a
l
commit
|
commitdiff
|
tree
2012-08-21
Mikaël
B
a
rbe
r
o
f
i
x NPE when c
h
angi
n
g fr
o
m EMFCompareText
M
erg
e
V
i
ewer
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mika
ë
l Barbero
do not try to
resolve resou
r
ces
f
rom localRes
o
ur
c
e
Set
.
.
.
commit
|
commitdiff
|
tree
2012-08-21
Mikaë
l
Barbero
ad
d
pre
l
i
m
i
nary support fo
r
u
n
do redo in text
m
erg
e
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
Mika
ë
l B
a
rb
e
ro
handle undo/redo on c
o
py all non conflicting a
c
tion
commit
|
commitdiff
|
tree
2012-08-20
Mikaël
B
arbero
a
dd preli
m
i
n
ary
s
upport for
I
St
r
ea
m
ContentAccessor
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
Mikaël Ba
r
bero
r
e
named variable
commit
|
commitdiff
|
tree
2012-08-20
Mikaël
B
a
r
bero
fi
x
is
s
u
e
with disp
l
ayed ins
e
rtion
p
oints (was not
.
.
.
commit
|
commitdiff
|
tree
2012-08-20
Mikaël Barbe
r
o
d
i
s
play merged
a
nd discarded diff with a grey fon
t
commit
|
commitdiff
|
tree
2012-08-20
Mikaël
B
arbero
d
i
splay
p
r
o
xy with italic font
commit
|
commitdiff
|
tree
2012-08-13
Mikaël Barbero
add prelimi
n
ary su
p
port of u
n
do/redo
commit
|
commitdiff
|
tree
2012-08-10
Mi
k
aël Barbero
change
contr
a
ct
of Comparison#getDifferen
c
es(EObject
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
Mi
k
aël Barbero
happy checkst
y
le
commit
|
commitdiff
|
tree
2012-08-10
Mikaë
l
Barbero
change DiffCrossRefe
r
en
c
er
t
o handle subclasse
s
o
f
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
Mikaël
Barbero
s
o
me
r
e
f
a
ctoring to make
th
e
code
c
learer
commit
|
commitdiff
|
tree
2012-08-10
Mikaël Barbe
r
o
se
t
Th
r
eeW
a
y should
be call as ea
r
ly as possible (test
.
.
.
commit
|
commitdiff
|
tree
2012-08-10
Mikaël
B
arbe
r
o
add lines b
e
t
w
e
e
n diffs
commit
|
commitdiff
|
tree
2012-08-10
Mikaël
Barbero
use cli
e
nt are
a
i
nstead of bound
s
of the T
a
ble
commit
|
commitdiff
|
tree
2012-08-10
Mikaël
B
arbero
fix c
l
ippi
n
g
are
a
iss
u
e on w
i
ndows
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbero
add
u
m
l2
.
ide
.
u
i
commit
|
commitdiff
|
tree
2012-08-09
M
ikaël Barbero
a
dd new uml
2
.
ide
.
ui plugin t
o
special
i
ze UI
commit
|
commitdiff
|
tree
2012-08-09
Mik
a
ël Barbero
ad
d
s
p
e
cifi
c
mehtods for content providers
commit
|
commitdiff
|
tree
2012-08-09
Mi
k
aël Barbero
chang
e
how
g
roups are handle
d
: no more adaptatio
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barber
o
add s
p
e
c
ific
T
extMergeViewer
t
o re
m
ove
s
u
pport fo
r
.
.
.
commit
|
commitdiff
|
tree
2012-08-09
Mikaël Barbero
filt
e
r
o
ut diff refined by or required by refine
s
by
commit
|
commitdiff
|
tree
2012-08-09
Mi
k
aël
Ba
r
b
ero
added cross ref
e
r
ence d
i
ffere
n
ces on Comparison#ge
t
Diffe
r
enc
.
.
.
commit
|
commitdiff
|
tree
2012-08-08
M
ikaël Barber
o
add eRe
f
eren
c
e reference on
U
MLDiff E
C
lass
commit
|
commitdiff
|
tree
2012-08-07
Mi
k
a
ë
l
B
arbero
fi
x
adapte
r
f
a
ctory & epackage uri after ref
a
ctoring
commit
|
commitdiff
|
tree
2012-08-07
Mikaël Barbero
some refact
o
rin
g
in UML
c
o
mpare
extension
commit
|
commitdiff
|
tree
2012-08-06
Mi
k
aël Barbero
remove
d
unused m
e
r
ge
w
ay ti
p
action
commit
|
commitdiff
|
tree
2012-08-03
Mik
a
ël Barbero
add merge al
l
n
o
n conflicti
n
g diffs
f
rom one
side t
o
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
add custom Merge
V
iewerContentProvider
t
o handl
e
save
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Bar
b
e
ro
do not provide overla
y
ima
g
e for
m
a
t
ch w
i
t
h
incomin
g
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
add
a log(Except
i
on) method
commit
|
commitdiff
|
tree
2012-08-03
Mika
ë
l
Barbero
depend
o
nly on ju
n
o & or
b
it up
d
ate site
commit
|
commitdiff
|
tree
2012-08-03
Mikaël
B
a
rbero
a
d
d a EMFCompare
C
onfiguration cla
s
s to
c
o
nfigure the
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbe
r
o
m
ov
e
ev
e
ry class
e
s from ide
.
ui
b
undle into x-internal
.
.
.
commit
|
commitdiff
|
tree
2012-08-03
Mikaël Barbero
print
out conflicts t
o
o
commit
|
commitdiff
|
tree
next