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 Barber
o
[40926
2
] UI relat
e
d
operati
o
n
s
in c
o
mm
a
ndStack
C
ha
n
ged
.
.
.
commit
|
commitdiff
|
tree
2013-05-28
M
ikaël Barbe
r
o
[4
0
9262]
a
ll ui
rela
t
e
d o
p
era
t
ions in c
o
mm
a
nd
S
ta
c
kChang
e
d
.
.
.
commit
|
commitdiff
|
tree
2013-05-28
Mikae
l
Ba
r
bero
Mer
g
e
"Fix bug in displ
a
ying diagram
s
i
n multi-diagram
.
.
.
commit
|
commitdiff
|
tree
2013-05-27
Mikaël Barbero
updat
e
ta
r
get
platfor
m
def
i
ni
t
i
on
commit
|
commitdiff
|
tree
2013-05-24
Mikael Ba
r
bero
Merge "Avo
i
d nesting iterables/i
t
erators
w
ith
c
oncat
.
.
.
commit
|
commitdiff
|
tree
2013-05-24
Mikaël
Ba
r
bero
fix NPE whe
n
closin
g
the c
o
mpare editor
before
commit
|
commitdiff
|
tree
2013-05-24
M
i
kaël B
a
rb
e
ro
add kepler rc1 targe
t
platform definitio
n
commit
|
commitdiff
|
tree
2013-05-15
Mikaël
Barber
o
add
kepler m7 target platf
o
rm
commit
|
commitdiff
|
tree
2013-05-13
Mikaël Barbero
f
i
x c
h
oco
c
o
m
mit
commit
|
commitdiff
|
tree
2013-05-13
Mikaël Barber
o
c
h
ange
t
he r
a
nge
for
the #popu
l
a
teMen
u
Man
a
ger fix
commit
|
commitdiff
|
tree
2013-05-02
Mik
a
ël Barbe
r
o
re
m
ove unnecessa
r
y singleton directi
v
e
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Barbero
[406537] Edition of te
x
t merge vie
w
er live-updates
.
.
.
commit
|
commitdiff
|
tree
2013-04-30
M
i
ka
ë
l Barbero
Ex
e
cute UI-related code in safe utility
commit
|
commitdiff
|
tree
2013-04-30
M
i
kaël Barbero
Added minimum version o
f
UML to 4
.
0
commit
|
commitdiff
|
tree
2013-04-30
Mi
k
a
ël B
a
rbero
Added
m
ethod to lo
g
exceptio
n
s
commit
|
commitdiff
|
tree
2013-04-30
Mikaël
B
arbero
r
e
move hard depen
d
ency
to uml 4
.
1
i
n
t
est
s
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Bar
b
ero
r
emove
hard dependency to pa
p
yrus 0
.
10 in tests
commit
|
commitdiff
|
tree
2013-04-29
M
i
kaël
Barbero
Removed un
n
ecess
a
ry keyword
commit
|
commitdiff
|
tree
2013-04-29
Mi
k
a
ël B
a
rbero
Ad
d
progress monitor to
log
i
cal model resolution
.
commit
|
commitdiff
|
tree
2013-04-26
Mikaël B
a
rbero
Fixed the
enable
s
tatus
o
f
merg
e
button
commit
|
commitdiff
|
tree
2013-04-26
Mikaël Barber
o
[
40644
5
] copy
all should al
s
o work i
n
2 ways
commit
|
commitdiff
|
tree
2013-04-26
Mikaël
B
arbero
[
4
06
6
26] update dirty state
d
uring conte
n
t
merger
v
iewe
r
.
.
.
commit
|
commitdiff
|
tree
2013-04-25
Mikaë
l
Ba
r
bero
[406541] a
l
low mer
g
e when co
m
paring t
w
o EObjects
commit
|
commitdiff
|
tree
2013-04-25
Mika
ë
l Barbero
ma
k
e
t
he save
possible from t
h
e
EMF
C
ompareText
M
ergeViewer
commit
|
commitdiff
|
tree
2013-04-25
M
i
kaël
B
a
rbero
[406548] Allow to save m
o
re
th
a
n once
commit
|
commitdiff
|
tree
2013-04-25
Mi
k
aë
l
Barbero
R
e
mov
e
compari
s
on c
a
che field
commit
|
commitdiff
|
tree
2013-04-25
Mikaël Barbero
[406
5
36] Li
s
ten to textu
a
l merge t
o
upd
a
te th
e
dirty
.
.
.
commit
|
commitdiff
|
tree
2013-04-25
M
i
ka
ë
l
B
arbero
[406524
]
call super
.
start() and super
.
s
t
o
p()
in c
l
a
s
s
.
.
.
commit
|
commitdiff
|
tree
2013-04-23
M
ikaël Bar
b
ero
update TP to m6
commit
|
commitdiff
|
tree
2013-04-23
Mikaël Ba
r
bero
Remove
d
ead cod
e
commit
|
commitdiff
|
tree
2013-04-19
Mik
a
ë
l Barbero
Conflic
t
and pseu
d
o
c
onflict
i
cons
commit
|
commitdiff
|
tree
2013-04-19
Mikaël
B
arb
e
ro
Simpler display for match over
l
ay
commit
|
commitdiff
|
tree
2013-04-18
M
ikaël B
a
r
b
e
r
o
Fix pot
e
nt
i
al NPE
.
commit
|
commitdiff
|
tree
2013-04-18
Mik
a
ë
l B
a
rbero
Open Tr
e
eC
o
nt
e
ntMerge
V
i
e
wer
on
a Match
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barb
e
ro
do not
o
verride setS
e
l
ection any
m
ore
commit
|
commitdiff
|
tree
2013-04-18
M
ikaël Barbero
H
andle pseudo conflict in tree viewe
r
s
commit
|
commitdiff
|
tree
2013-04-18
Mika
ë
l
Barbe
r
o
I
c
on and overla
y
of pseudo conf
l
ict
commit
|
commitdiff
|
tree
2013-04-18
Mi
k
aël Barbero
filter o
u
t
c
hildren of
c
ont
a
inment re
f
erences that
.
.
.
commit
|
commitdiff
|
tree
2013-04-18
M
i
kaël Barb
e
ro
Handle mu
l
t
ip
l
e
root
eleme
n
ts
.
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
d
o
n
o
t
filte
r
s out pseudo confli
c
t
commit
|
commitdiff
|
tree
2013-04-18
Mikaël
Barb
e
ro
Compu
t
e
mod
e
l differences in
b
ackground
.
commit
|
commitdiff
|
tree
2013-04-17
Mik
a
ë
l
Barbero
remove unnecessary
p
seudo del
e
te confl
i
ct f
i
lter
commit
|
commitdiff
|
tree
2013-04-17
Mikaël
B
a
rbe
r
o
oo
o
ps
.
.
.
2
commit
|
commitdiff
|
tree
2013-04-17
Mika
ë
l Barbero
oops
.
.
commit
|
commitdiff
|
tree
2013-04-17
M
i
kaël Barbero
move
all logica
l
model c
o
de to int
e
r
n
a
l
commit
|
commitdiff
|
tree
2013-04-17
Mik
a
ël Barbero
Happ
y
checkstyle
commit
|
commitdiff
|
tree
2013-04-16
Mikaël Barbe
r
o
fix
stran
g
e selec
t
ion behavior aft
e
r
a merge
commit
|
commitdiff
|
tree
2013-04-16
Mik
a
ël Ba
r
b
ero
fix
h
ow children fea
t
u
res
a
re
retrieved
commit
|
commitdiff
|
tree
2013-04-16
Mikaël Barbero
sometim
e
s p
a
ren
t
i
s
null
(when i
t
i
s the
root
.
.
.
)
commit
|
commitdiff
|
tree
2013-04-15
Mikaël Barbe
r
o
fi
x
regression whi
l
e openi
n
g
c
o
m
pare
e
ditor/dialog
commit
|
commitdiff
|
tree
2013-04-15
Mik
a
ël Barbero
fix NPE when c
o
mpa
r
ing 2 EObj
e
cts
commit
|
commitdiff
|
tree
2013-04-15
Mikaël Bar
b
ero
add support for save action with juno
commit
|
commitdiff
|
tree
2013-04-15
Mik
a
ël Barbero
f
ix center line wh
e
n
diff is a move
commit
|
commitdiff
|
tree
2013-04-15
Mikaël Barbero
add pse
u
do conflict
merger
commit
|
commitdiff
|
tree
2013-04-12
M
i
kaël
B
arbe
r
o
re-
e
nable c
o
p
y
all non reflecti
v
e in TCMV
commit
|
commitdiff
|
tree
2013-04-12
Mikaë
l
Barbero
Di
s
playing tree of containement refe
r
ence cha
n
ge
s
commit
|
commitdiff
|
tree
2013-04-10
Mikaël B
a
rbero
do not
use
raw typ
e
commit
|
commitdiff
|
tree
2013-03-19
Mikaël B
a
rbero
Add Kepler M
6
tar
g
et platform definition
commit
|
commitdiff
|
tree
2013-03-19
Mikaël Barbe
r
o
A
dd x-frie
n
ds betwee
n
our plu
g
ins
commit
|
commitdiff
|
tree
2013-03-19
Mikaël
Barbero
make diagram
f
ilter interna
l
commit
|
commitdiff
|
tree
2013-03-18
Mikaël Barbero
[4
0
02
3
4
]
Add acc
e
sso
r
fa
c
to
r
y for Comparison objects
commit
|
commitdiff
|
tree
2013-03-16
Mikaël B
a
rbero
[4
0
354
3
] Do not cal
l
E
cor
e
Util
.
convertToString() if
.
.
.
commit
|
commitdiff
|
tree
2013-03-15
Mikaël Barb
e
r
o
an excep
t
i
o
n
has to be thrown t
o
b
e
use
f
ul!
commit
|
commitdiff
|
tree
2013-03-15
Mikaë
l
Barbero
[403423] fix NPE when
c
omparin
g
pro
f
iled UML2 3
.
x
commit
|
commitdiff
|
tree
2013-03-13
Mi
k
a
ël B
a
rbero
a
d
d cont
e
n
t
type binding for
d
efaul
t
e
mf
compare content
.
.
.
commit
|
commitdiff
|
tree
2013-03-13
Mikaël Barbero
fix bug in
d
iffnode (shoul
d
re
t
u
rn null when nee
d
e
d
)
commit
|
commitdiff
|
tree
2013-03-13
Mikaë
l
Barbero
rename
U
M
L2 ide(
.
ui) packa
g
es to rcp
(
.
ui)
commit
|
commitdiff
|
tree
2013-03-13
Mikaël Barbe
r
o
rename UML2 id
e
(
.
ui) plugins to
rcp(
.
ui)
commit
|
commitdiff
|
tree
2013-03-13
Mikaël
B
ar
b
e
ro
a
d
d
b
a
sic implementation of po
s
t proces
s
or descripto
r
commit
|
commitdiff
|
tree
2013-03-13
Mikaël
Barbero
mo
v
e acce
s
sorFact
o
ry extension po
i
nt from ide
.
ui to
.
.
.
commit
|
commitdiff
|
tree
2013-03-12
Mik
a
ël
B
arbero
[44393] hide "expand" button in front
of item with
.
.
.
commit
|
commitdiff
|
tree
2013-03-12
M
i
kaël B
a
rbero
checkstyle and findb
u
gs
commit
|
commitdiff
|
tree
2013-03-12
M
i
ka
ë
l Ba
r
bero
h
a
p
py checkstyle
commit
|
commitdiff
|
tree
2013-03-11
M
i
kaël Barbero
r
e
factored
IPos
t
Processor to move nsURI and resourceURI
.
.
.
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Barbe
r
o
re
f
actored too much (bis)
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Barbero
refactored too much
commit
|
commitdiff
|
tree
2013-03-11
M
ik
a
ël Barbero
remove warn
i
ng fr
o
m build
.
properties
commit
|
commitdiff
|
tree
2013-03-11
M
i
kaël Barber
o
move load on demand
policy to RCP
p
lugin
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Bar
b
ero
r
emove
u
nused and deprecated
E
MFCompareCo
n
fi
g
uration
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Barbero
fix monitor
issue
.
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Barbero
refactor UML plugins t
o
ma
k
e all classes inter
n
al befor
e
.
.
.
commit
|
commitdiff
|
tree
2013-03-11
Mika
ë
l
B
arbero
[39
9
2
6
4]
S
e
p
arate
pur
e
RCP cod
e
f
r
om UI an
d
IDE
r
elated
.
.
.
commit
|
commitdiff
|
tree
2013-03-11
Mikaë
l
Bar
b
ero
add Monitor
t
o I
E
O
b
j
ec
t
Matcher
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Barbero
update target definition files to refers to Orb
i
t stable
.
.
.
commit
|
commitdiff
|
tree
2013-03-07
M
ikaël
Ba
r
bero
a
d
d targe
t
platfor
m
definitions for tests with gu
a
va 12+
commit
|
commitdiff
|
tree
2013-03-07
Mikaël
B
ar
b
ero
[401595] Relax constrain
t
o
n
i
mp
o
rt
e
d packages fro
m
.
.
.
commit
|
commitdiff
|
tree
2013-03-07
Mikaël Barbero
use
L
o
a
dingCa
c
he in
s
tead
o
f C
a
c
he
commit
|
commitdiff
|
tree
2013-03-06
Mikaël Barbero
change
f
o
r guava 1
1
commit
|
commitdiff
|
tree
2013-03-05
M
i
kaël B
a
rb
e
ro
updat
e
v
ersion
n
umber
r
egarding the MANIFEST (bis)
commit
|
commitdiff
|
tree
2013-03-05
Mikaël
B
arbero
update versi
o
n numb
e
r regarding th
e
MANIFEST
commit
|
commitdiff
|
tree
2013-03-05
Mikaël
B
arber
o
remove deleted plu
g
ins from fe
a
tu
r
e (bis)
commit
|
commitdiff
|
tree
2013-03-05
M
ikaël Bar
b
ero
remove del
e
t
e
d
plu
g
ins from feature
commit
|
commitdiff
|
tree
2013-03-05
Mikaël Barbero
f
i
x choco c
o
mmit
afte
r
refactoring of
gmf/diagr
a
m plugins
commit
|
commitdiff
|
tree
2013-03-05
Mikaël Barbero
ch
a
nge d
e
pendency from G
u
ava 10
.
0
.
1 t
o
Guava 11
.
0
.
2
commit
|
commitdiff
|
tree
2013-03-04
Mikaël Barbero
f
i
x parent pom to use k
e
pler M
5
target defi
n
ition
commit
|
commitdiff
|
tree
2013-03-04
M
ikaël Barbero
add Kepler
M5 ta
r
get
de
f
initi
o
n f
i
le
commit
|
commitdiff
|
tree
2013-02-13
Mik
a
ël Barb
e
ro
r
e
move
dependency to junit
commit
|
commitdiff
|
tree
2013-02-12
Mikaël
B
arbero
fix wrong reference to PLUGIN_ID
commit
|
commitdiff
|
tree
2013-02-04
Mika
ë
l Barbero
Raise t
h
e t
i
meout t
o
60sec
for
Eclipse
H
udson after
commit
|
commitdiff
|
tree
2013-02-04
Mikaël Bar
b
ero
fi
x
reg
r
ession i
n
UML
2
t
e
sts
.
commit
|
commitdiff
|
tree
next