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
[409262] UI related operations in commandStackChanged must be protected
2013-05-28
Mikaël Barbero
[409262] UI
relate
d
op
e
r
a
tions in co
m
mandSt
a
ckChan
g
ed
.
.
.
commit
|
commitdiff
|
tree
2013-05-28
Mikaël Barbero
[40926
2
] all ui related ope
r
ations i
n
comman
d
StackChan
g
ed
.
.
.
commit
|
commitdiff
|
tree
2013-05-27
Mikaël Barbero
update t
a
rget platform
d
efinition
commit
|
commitdiff
|
tree
2013-05-24
Mikaë
l
Barbero
fix
N
PE when cl
o
s
ing the
c
o
mp
a
re editor before
commit
|
commitdiff
|
tree
2013-05-24
Mikaël
Barbero
a
d
d kepler rc1 target pla
t
form definiti
o
n
commit
|
commitdiff
|
tree
2013-05-15
Mikaël Barbe
r
o
add kepler m7 t
a
rget platf
o
rm
commit
|
commitdiff
|
tree
2013-05-13
Mi
k
aël Barbero
fi
x
choco commit
commit
|
commitdiff
|
tree
2013-05-13
Mi
k
aël
Barbero
change the range for
t
he #popu
l
ateM
e
nuMan
a
ger
f
ix
commit
|
commitdiff
|
tree
2013-05-02
M
ikaël Barber
o
r
e
move unnecessa
r
y singleton direct
i
ve
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Barbero
[406537] E
d
ition
o
f
text merge view
e
r live-
u
p
d
ates
.
.
.
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Barbero
Exec
u
te UI
-
r
e
lated code in saf
e
utility
commit
|
commitdiff
|
tree
2013-04-30
Mikaë
l
Barber
o
Adde
d
minimum version of U
M
L
to 4
.
0
commit
|
commitdiff
|
tree
2013-04-30
M
i
kaël Barbero
A
dded metho
d
to
log exce
p
ti
o
ns
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Barbero
remove h
a
rd
d
epen
d
ency to uml
4
.
1 in tests
commit
|
commitdiff
|
tree
2013-04-30
Mi
k
aël Barbero
remove hard depend
e
ncy to pa
p
yru
s
0
.
10 in
tests
commit
|
commitdiff
|
tree
2013-04-29
Mika
ë
l Ba
r
bero
Removed
unnecessary ke
y
word
commit
|
commitdiff
|
tree
2013-04-29
Mikaël Barbe
r
o
Add p
r
ogre
s
s m
o
nitor to
l
o
g
ical model resol
u
ti
o
n
.
commit
|
commitdiff
|
tree
2013-04-26
Mik
a
ël Barbe
r
o
F
ixed the enable status
of merge butto
n
commit
|
commitdiff
|
tree
2013-04-26
M
ikaël Barbero
[
4
06445] copy all should al
s
o work in 2 w
a
ys
commit
|
commitdiff
|
tree
2013-04-26
M
i
kaë
l
Barbero
[406626] update
d
i
r
t
y
s
tate
d
uring conte
n
t merger viewer
.
.
.
commit
|
commitdiff
|
tree
2013-04-25
M
i
ka
ë
l Ba
r
bero
[
4
06541] allow merge
whe
n
comparing two EObject
s
commit
|
commitdiff
|
tree
2013-04-25
Mikaël Barbero
make the sa
v
e
p
o
ssi
b
le from
th
e
EMFCo
m
p
areTextMergeViewer
commit
|
commitdiff
|
tree
2013-04-25
M
ikaë
l
Ba
r
bero
[
406548]
A
l
l
o
w to sa
v
e more th
a
n
o
n
c
e
commit
|
commitdiff
|
tree
2013-04-25
Mikaël Barbe
r
o
Remove com
p
arison cac
h
e f
i
e
l
d
commit
|
commitdiff
|
tree
2013-04-25
M
ika
ë
l Barber
o
[40
6
536
]
Li
s
ten to textua
l
merg
e
to up
d
ate the dirty
.
.
.
commit
|
commitdiff
|
tree
2013-04-25
Mikaël
B
arbero
[4065
2
4] ca
l
l
sup
e
r
.
star
t
() and
sup
e
r
.
stop() i
n
class
.
.
.
commit
|
commitdiff
|
tree
2013-04-23
Mikaël
B
a
rbero
update TP to m6
commit
|
commitdiff
|
tree
2013-04-23
Mik
a
ël B
a
rb
e
ro
R
em
o
ve dead
c
o
d
e
commit
|
commitdiff
|
tree
2013-04-19
Mik
a
ël B
a
r
b
ero
Conflict and ps
e
udo confl
i
c
t
i
c
ons
commit
|
commitdiff
|
tree
2013-04-19
Mikaël Barbero
Simpler
disp
l
ay for match o
v
erlay
commit
|
commitdiff
|
tree
2013-04-18
M
i
kaël Ba
r
b
e
ro
Fix potential NP
E
.
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
Op
e
n T
r
eeContentMergeViewe
r
on
a M
a
t
c
h
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
do
not o
v
erride
s
etSelection anymore
commit
|
commitdiff
|
tree
2013-04-18
M
i
kaël Barbero
Ha
n
dl
e
pseudo co
n
flict in
t
ree viewers
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
Ic
o
n and overlay of
p
seudo conflict
commit
|
commitdiff
|
tree
2013-04-18
M
ikaël Barbero
fi
l
t
e
r out chil
d
ren of
containment r
e
feren
c
es that
.
.
.
commit
|
commitdiff
|
tree
2013-04-18
Mi
k
a
ë
l
Barbe
r
o
Handle multipl
e
root
ele
m
ents
.
commit
|
commitdiff
|
tree
2013-04-18
M
i
k
a
ël Ba
r
bero
do not filters out
pseu
d
o con
f
lic
t
commit
|
commitdiff
|
tree
2013-04-18
Mika
ë
l
Barbero
Compute model differe
n
ces
in background
.
commit
|
commitdiff
|
tree
2013-04-17
M
ikaël Barbero
r
e
m
ove
u
nnecessar
y
pseudo del
e
te conflict
filter
commit
|
commitdiff
|
tree
2013-04-17
Mikaël Barbe
r
o
ooops
.
.
.
2
commit
|
commitdiff
|
tree
2013-04-17
Mikaë
l
Bar
b
ero
oops
.
.
commit
|
commitdiff
|
tree
2013-04-17
Mikaël Barbero
move all logi
c
al
m
o
del c
o
de
to internal
commit
|
commitdiff
|
tree
2013-04-17
Mikaël Barbero
Happy ch
e
ck
s
ty
l
e
commit
|
commitdiff
|
tree
2013-04-16
M
i
k
aë
l
Barber
o
fix st
r
ange se
l
ect
i
o
n be
h
avior afte
r
a merge
commit
|
commitdiff
|
tree
2013-04-16
Mikaël Barb
e
ro
fix how children
f
eatures are re
t
rieved
commit
|
commitdiff
|
tree
2013-04-16
Mik
a
ël Barbero
someti
m
es par
e
nt is
null (when it
i
s the ro
o
t
.
.
.
)
commit
|
commitdiff
|
tree
2013-04-15
Mik
a
ël
B
arbero
fi
x
regressi
o
n
whil
e
openi
n
g compare
e
d
i
t
or/dialog
commit
|
commitdiff
|
tree
2013-04-15
Mikaël Barbe
r
o
fix NPE when compar
i
ng 2 EObjec
t
s
commit
|
commitdiff
|
tree
2013-04-15
Mi
k
aël Barbero
add support for
save action with juno
commit
|
commitdiff
|
tree
2013-04-15
Mi
k
a
ël Barbero
f
i
x center line when diff is a
move
commit
|
commitdiff
|
tree
2013-04-15
Mika
ë
l Barbero
add pseudo co
n
flict mer
g
e
r
commit
|
commitdiff
|
tree
2013-04-12
Mikaë
l
Barber
o
re-enab
l
e copy all
no
n
reflecti
v
e
i
n
TCM
V
commit
|
commitdiff
|
tree
2013-04-12
Mikaël Barbero
Displaying tre
e
of conta
i
n
e
ment ref
e
rence ch
a
n
g
es
commit
|
commitdiff
|
tree
2013-04-10
Mik
a
ël Barber
o
do no
t
use raw ty
p
e
commit
|
commitdiff
|
tree
2013-03-19
Mik
a
ël Barbero
A
dd Kepler
M
6
targ
e
t platform defi
n
ition
commit
|
commitdiff
|
tree
2013-03-19
M
i
kaël Ba
r
bero
Add x-
f
rie
n
ds between our plugins
commit
|
commitdiff
|
tree
2013-03-19
Mikaël Barbero
make diagram filter internal
commit
|
commitdiff
|
tree
2013-03-18
Mikaël Barb
e
ro
[40
0
234
]
Add acc
e
sso
r
fa
c
t
o
r
y
for
C
omparison objects
commit
|
commitdiff
|
tree
2013-03-16
Mikaël Barbero
[4035
4
3] Do not call
EcoreUtil
.
c
onvert
T
oString() if
.
.
.
commit
|
commitdiff
|
tree
2013-03-15
Mikaël B
a
rbero
a
n
exception has to be thr
o
wn
t
o be useful!
commit
|
commitdiff
|
tree
2013-03-15
Mikaël Barbe
r
o
[403423
]
f
i
x NPE when comp
a
ring profil
e
d UML
2
3
.
x
commit
|
commitdiff
|
tree
2013-03-13
M
ikaël Barbero
add content
type
b
inding for
d
efault emf compare content
.
.
.
commit
|
commitdiff
|
tree
2013-03-13
Mikaël Barbero
fi
x
b
u
g in di
f
fnode (should
r
etur
n
null when needed
)
commit
|
commitdiff
|
tree
2013-03-13
Mikaël B
a
rbero
re
n
a
m
e UML2 ide(
.
ui) pa
c
kages to rc
p
(
.
ui)
commit
|
commitdiff
|
tree
2013-03-13
Mikaël B
a
r
be
r
o
rename
UML
2
i
de
(
.
u
i
)
plugins to rc
p
(
.
ui
)
commit
|
commitdiff
|
tree
2013-03-13
Mikaël Barbero
add basic impl
e
mentation of post
p
roc
e
s
sor d
e
scr
i
p
t
o
r
commit
|
commitdiff
|
tree
2013-03-13
M
ikaël Barb
e
ro
mo
v
e accessorFactory ex
t
e
n
sion po
i
nt
f
rom ide
.
u
i
to
.
.
.
commit
|
commitdiff
|
tree
2013-03-12
Mikaël Ba
r
bero
[
4
4393]
h
ide "e
x
pand" button in front of item with
.
.
.
commit
|
commitdiff
|
tree
2013-03-12
Mik
a
ël Ba
r
bero
ch
e
cksty
l
e
a
nd findbugs
commit
|
commitdiff
|
tree
2013-03-12
Mikaël Barbero
happy checkstyle
commit
|
commitdiff
|
tree
2013-03-11
Mikaël
B
arbe
r
o
refa
c
tored I
P
os
t
Processor to
move nsURI and reso
u
rceU
R
I
.
.
.
commit
|
commitdiff
|
tree
2013-03-11
Mika
ë
l B
a
rber
o
refactored too
m
u
ch
(bis)
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Barb
e
r
o
refact
o
red too much
commit
|
commitdiff
|
tree
2013-03-11
M
i
k
aël
B
ar
b
ero
remove warn
i
ng from bu
i
ld
.
properties
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Barbero
move load on demand policy to RCP plugin
commit
|
commitdiff
|
tree
2013-03-11
M
ik
a
ël Barbero
remove unused and deprecated EMFCo
m
pareCon
f
ig
u
ratio
n
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Barb
e
ro
f
i
x monitor is
s
ue
.
commit
|
commitdiff
|
tree
2013-03-11
Mikaël
B
a
rbero
ref
a
c
t
o
r UML plugins to make all classes intern
a
l
b
efor
e
.
.
.
commit
|
commitdiff
|
tree
2013-03-11
Mi
k
aël Barbero
[39926
4
] Sep
a
rate
pu
r
e RCP
c
ode from UI and ID
E
related
.
.
.
commit
|
commitdiff
|
tree
2013-03-11
Mik
a
ël Barbero
add Moni
t
or to IEOb
j
ectMatcher
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Bar
b
ero
update target definition
f
i
l
es to refers
t
o Orbit stable
.
.
.
commit
|
commitdiff
|
tree
2013-03-07
Mik
a
ë
l Barbero
add target p
l
atform definition
s
for tests
w
i
th guav
a
12+
commit
|
commitdiff
|
tree
2013-03-07
M
i
kaël Barbero
[401595]
R
elax constrain
t
o
n
imp
o
rte
d
packages fro
m
.
.
.
commit
|
commitdiff
|
tree
2013-03-07
Mikaël Barbero
u
s
e LoadingCache i
n
stead of Cache
commit
|
commitdiff
|
tree
2013-03-06
Mikaël Barbero
change for guava
1
1
commit
|
commitdiff
|
tree
2013-03-05
Mikaë
l
Barbero
update ver
s
ion num
b
er regarding the MANI
F
EST
(bis)
commit
|
commitdiff
|
tree
2013-03-05
Mikaël Bar
b
e
r
o
update
v
e
rsion
n
um
b
er regarding
t
h
e
M
A
NIFES
T
commit
|
commitdiff
|
tree
2013-03-05
Mikaë
l
B
a
rber
o
remove de
l
eted plu
g
in
s
from feature (bis)
commit
|
commitdiff
|
tree
2013-03-05
M
i
kaël Ba
r
bero
re
m
ove de
l
e
t
ed p
l
ugins from
feature
commit
|
commitdiff
|
tree
2013-03-05
Mikaël Barber
o
fix
c
ho
c
o commit after refactoring of gmf/dia
g
ram plugins
commit
|
commitdiff
|
tree
2013-03-05
Mikaël Barbero
change
d
ependency from Gua
v
a
10
.
0
.
1 to Guava 1
1
.
0
.
2
commit
|
commitdiff
|
tree
2013-03-04
M
i
kaë
l
Barbero
f
i
x parent pom to use keple
r
M5
target d
e
fini
t
ion
commit
|
commitdiff
|
tree
2013-03-04
M
ik
a
ël Barbero
add
Kepler M5 targe
t
d
efin
i
tio
n
file
commit
|
commitdiff
|
tree
2013-02-13
Mikaël Barbero
remove
dependency to
j
uni
t
commit
|
commitdiff
|
tree
2013-02-12
Mikaël Barber
o
fix wrong reference to PLUGIN_ID
commit
|
commitdiff
|
tree
2013-02-04
Mikaë
l
Ba
r
bero
Raise t
h
e timeout to 60se
c
f
o
r
Eclipse H
u
dson aft
e
r
commit
|
commitdiff
|
tree
2013-02-04
Mikaë
l
Barbero
fix regression in UML 2 tests
.
commit
|
commitdiff
|
tree
2013-02-01
Mikaël Barbero
C
h
ange Comparis
o
nSp
e
c#getDifferences() to retu
r
n differ
e
nces
.
.
.
commit
|
commitdiff
|
tree
2013-02-01
Mik
a
ël Ba
r
bero
add image for Ma
t
chedResource ob
j
ec
t
s that us
e
the
.
.
.
commit
|
commitdiff
|
tree
next