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
[413511] Do not include root of TreeIterator
2013-07-23
Mikaël Barbero
[413511] Do
n
o
t include root of Tre
e
Iterat
o
r
Signed-off-by:
Mikaël Barbero
<mikael.barbero@obeo.fr>
commit
|
commitdiff
|
tree
2013-07-16
M
i
kaël B
a
rbero
Refactoring of th
e
mergers
commit
|
commitdiff
|
tree
2013-07-16
Mika
ë
l Ba
r
bero
R
e
fact
o
r Groups
.
commit
|
commitdiff
|
tree
2013-06-28
Mikaël Barbero
add Kep
l
er
f
i
n
al t
a
rget platform definition
commit
|
commitdiff
|
tree
2013-06-14
Mika
ë
l
B
arbero
[410738] add p2
.
inf to still
provide
o
rg
.
eclipse
.
emf
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
Mikaël Barbero
[409281] setSelec
t
ion to widget to avoid content viewer
.
.
.
commit
|
commitdiff
|
tree
2013-05-30
Mikaël B
a
rbero
Never comp
e
te
w
ith
Document u
p
dating during
m
o
del synchroniz
.
.
.
commit
|
commitdiff
|
tree
2013-05-30
M
ikaël Barber
o
[
4
0
93
6
3] displ
a
y
related
chan
g
es fo
r
a At
t
ributeChange
.
.
.
commit
|
commitdiff
|
tree
2013-05-29
Mikaël Barbero
[40
9
262] UI related operations in commandStackCh
a
nged
.
.
.
commit
|
commitdiff
|
tree
2013-05-27
M
ikaë
l
Barber
o
update targ
e
t platfo
r
m definition
commit
|
commitdiff
|
tree
2013-05-23
M
ikaël Barbero
fix
N
PE when clos
i
ng the compare edit
o
r before
commit
|
commitdiff
|
tree
2013-05-22
Mikaël Barber
o
a
dd kepler rc1
t
arget platfor
m
definiti
o
n
commit
|
commitdiff
|
tree
2013-05-15
Mikaël
Barb
e
ro
ad
d
kepler m7
target
platform
commit
|
commitdiff
|
tree
2013-05-13
M
i
k
aël Barbero
fix ch
o
co c
o
mmi
t
commit
|
commitdiff
|
tree
2013-05-13
Mikaël Barbe
r
o
change the range
for th
e
#po
p
u
l
ateMenuManager fix
commit
|
commitdiff
|
tree
2013-05-02
Mikaël B
a
rber
o
rem
o
v
e
unnecessa
r
y si
n
gleton dir
e
c
tive
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Ba
r
bero
[4
0
6537] Edition o
f
text me
r
g
e
viewer live-update
s
.
.
.
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Barbero
Execu
t
e UI-related
c
ode i
n
safe
utility
commit
|
commitdiff
|
tree
2013-04-30
Mikaël
B
a
rbero
Added minimum
v
e
r
s
ion o
f
UM
L
t
o
4
.
0
commit
|
commitdiff
|
tree
2013-04-30
Mikaël
B
ar
b
ero
Added
m
ethod to log exception
s
commit
|
commitdiff
|
tree
2013-04-30
Mikaël Barbero
rem
o
ve hard dependen
c
y to uml 4
.
1 in
tests
commit
|
commitdiff
|
tree
2013-04-30
M
i
kaël Barbero
r
e
move
h
a
rd dependency to
papy
r
u
s 0
.
1
0
in tests
commit
|
commitdiff
|
tree
2013-04-29
M
ikaël Ba
r
bero
Removed unnecessary keyword
commit
|
commitdiff
|
tree
2013-04-29
Mikaël
Barbero
Ad
d
progress mon
i
tor to logical model re
s
olutio
n
.
commit
|
commitdiff
|
tree
2013-04-26
Mikaël Barbero
Fixed th
e
en
a
ble s
t
atus o
f
merge button
commit
|
commitdiff
|
tree
2013-04-26
Mikaël
B
a
rbero
[406445] copy all should also work in 2
w
ays
commit
|
commitdiff
|
tree
2013-04-26
Mikaël Barb
e
ro
[
4
06626] update dirty state dur
i
ng content
merger viewer
.
.
.
commit
|
commitdiff
|
tree
2013-04-25
Mikaël B
a
rbero
[40
6
541]
allow
mer
g
e when comparing two EObjects
commit
|
commitdiff
|
tree
2013-04-25
Mikaël Bar
b
ero
make the save possible from
t
he EMFCo
m
p
a
r
eTextMergeViewer
commit
|
commitdiff
|
tree
2013-04-25
Mikaël Barb
e
ro
[40654
8
]
A
l
lo
w
to save more than once
commit
|
commitdiff
|
tree
2013-04-25
Mikaël Barber
o
R
emove comp
a
r
iso
n
cache field
commit
|
commitdiff
|
tree
2013-04-25
Mikaël Ba
r
bero
[40
6
53
6
] Listen to textua
l
merge to update the
dirty
.
.
.
commit
|
commitdiff
|
tree
2013-04-25
Mikaël Barbero
[406524]
c
a
ll super
.
s
t
a
r
t() a
n
d super
.
st
o
p() in class
.
.
.
commit
|
commitdiff
|
tree
2013-04-23
Mikaël Barbero
upda
t
e
TP
t
o m
6
commit
|
commitdiff
|
tree
2013-04-23
Mikaël
B
a
r
bero
Remove dead co
d
e
commit
|
commitdiff
|
tree
2013-04-19
M
ikaël
B
a
r
bero
Conflict and pseudo conflict
icon
s
commit
|
commitdiff
|
tree
2013-04-19
Mikaël Ba
r
ber
o
Simple
r
display for matc
h
overlay
commit
|
commitdiff
|
tree
2013-04-18
Mik
a
ël
B
arb
e
ro
Fix potential NPE
.
commit
|
commitdiff
|
tree
2013-04-18
Mikaël
B
a
rbero
Open TreeCo
n
tentMergeViewer
o
n a Matc
h
commit
|
commitdiff
|
tree
2013-04-18
Mikaë
l
B
arbero
d
o not overr
i
de
s
e
tSelection a
n
ymo
r
e
commit
|
commitdiff
|
tree
2013-04-18
Mikaë
l
B
arbero
Ha
n
d
le pseudo
conflict in
tree viewers
commit
|
commitdiff
|
tree
2013-04-18
M
i
k
a
ël Barbero
Ic
o
n and overlay of pseudo co
n
flict
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
f
ilter out children of containme
n
t references that
.
.
.
commit
|
commitdiff
|
tree
2013-04-18
M
ikaël
B
arbero
Handle mult
i
ple
r
o
ot element
s
.
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
do not
f
i
l
ters out pseud
o
confl
i
ct
commit
|
commitdiff
|
tree
2013-04-18
Mikaël Barbero
Compu
t
e
model
differences in ba
c
kground
.
commit
|
commitdiff
|
tree
2013-04-17
M
ikaël Barber
o
r
emove
u
nn
e
c
e
ssary pse
u
do delete
c
o
nflict fil
t
er
commit
|
commitdiff
|
tree
2013-04-17
Mikaël Barbero
ooops
.
.
.
2
commit
|
commitdiff
|
tree
2013-04-17
Mikaël Barbero
oops
.
.
commit
|
commitdiff
|
tree
2013-04-17
Mik
a
ël Ba
r
ber
o
mo
v
e all logical
m
odel code to internal
commit
|
commitdiff
|
tree
2013-04-17
Mikaël
B
ar
b
ero
Ha
p
p
y
check
s
tyle
commit
|
commitdiff
|
tree
2013-04-16
Mi
k
aël Barbero
fix strange select
i
on behavior aft
e
r
a me
r
ge
commit
|
commitdiff
|
tree
2013-04-16
Mika
ë
l
B
arbero
fix
how children f
e
atures are ret
r
i
e
ved
commit
|
commitdiff
|
tree
2013-04-16
Mikaël Barbero
s
ometimes parent
i
s nu
l
l (when it is the ro
o
t
.
.
.
)
commit
|
commitdiff
|
tree
2013-04-15
Mik
a
ël Barbero
fix regr
e
ssion while
o
pening comp
a
re edit
o
r/dialo
g
commit
|
commitdiff
|
tree
2013-04-15
Mikaël Barbero
fix N
P
E whe
n
comparing 2 EObjects
commit
|
commitdiff
|
tree
2013-04-15
Mikaël Barb
e
ro
add sup
p
ort for sa
v
e a
c
t
io
n
with juno
commit
|
commitdiff
|
tree
2013-04-15
Mikaël Barbero
fix center
l
ine when
d
if
f
is a move
commit
|
commitdiff
|
tree
2013-04-15
Mikaël
B
arbero
a
d
d
pseudo conflict merger
commit
|
commitdiff
|
tree
2013-04-12
Mikaël Barbero
re-ena
b
l
e
copy
a
l
l non reflective in
T
CMV
commit
|
commitdiff
|
tree
2013-04-12
Mika
ë
l Barbero
Displaying
tree of cont
a
ineme
n
t
r
eference cha
n
ges
commit
|
commitdiff
|
tree
2013-04-10
Mikaël Barbero
d
o
not use raw type
commit
|
commitdiff
|
tree
2013-03-19
Mika
ë
l Barbero
Add Kepler M6 target platform definition
commit
|
commitdiff
|
tree
2013-03-19
Mikaël
Barbero
Add x-friends be
t
ween
our plugins
commit
|
commitdiff
|
tree
2013-03-19
Mikaël
Barbe
r
o
make diagram
f
i
lte
r
int
e
rnal
commit
|
commitdiff
|
tree
2013-03-18
Mikaël
B
ar
b
e
r
o
[
4
0
0
2
34]
Add accessor factory for Com
p
arison objects
commit
|
commitdiff
|
tree
2013-03-16
Mikaël
B
a
r
b
er
o
[403543
]
Do not call EcoreUt
i
l
.
conv
e
rtToString() if
.
.
.
commit
|
commitdiff
|
tree
2013-03-15
Mikaël Barber
o
an exception has to be thrown to
be u
s
efu
l
!
commit
|
commitdiff
|
tree
2013-03-15
M
ikaël
Barbero
[40
3
4
2
3] fix NPE
w
hen comp
a
ring prof
i
le
d
U
M
L2 3
.
x
commit
|
commitdiff
|
tree
2013-03-13
Mik
a
ël Barbero
ad
d
con
t
ent type b
i
nding for default emf compare content
.
.
.
commit
|
commitdiff
|
tree
2013-03-13
Mikaël Barbero
fix bug in diffnode (should return null
w
h
en needed
)
commit
|
commitdiff
|
tree
2013-03-13
Mika
ë
l B
a
rbero
rename
U
ML2
i
d
e(
.
u
i) pac
k
a
g
e
s
to
r
cp(
.
ui)
commit
|
commitdiff
|
tree
2013-03-13
Mikaël Barbero
rename
UML2 ide(
.
ui) plugins to
rcp
(
.
ui)
commit
|
commitdiff
|
tree
2013-03-13
Mikaël Barb
e
ro
add basic im
p
lementation of po
s
t pro
c
e
ss
o
r d
e
scriptor
commit
|
commitdiff
|
tree
2013-03-13
Mi
k
aël
B
a
rber
o
move accessorFactory extension point fro
m
i
de
.
u
i to
.
.
.
commit
|
commitdiff
|
tree
2013-03-12
Mikaël Barb
e
ro
[44393] hide "
e
xpand" button in front of item with
.
.
.
commit
|
commitdiff
|
tree
2013-03-12
M
ikaël Ba
r
bero
c
heckstyle a
n
d
findbugs
commit
|
commitdiff
|
tree
2013-03-12
Mik
a
ël B
a
rbe
r
o
ha
p
py checkstyle
commit
|
commitdiff
|
tree
2013-03-11
Mika
ë
l Barbero
r
e
fac
t
o
r
e
d
IPo
s
tProcessor to move nsURI an
d
resourceURI
.
.
.
commit
|
commitdiff
|
tree
2013-03-11
Mika
ë
l Barbero
re
f
actored too much (bis)
commit
|
commitdiff
|
tree
2013-03-11
M
ikaël B
a
rbero
re
f
actored too
m
uch
commit
|
commitdiff
|
tree
2013-03-11
Mika
ë
l Barbe
r
o
re
m
ove warning
from
buil
d
.
p
r
operti
e
s
commit
|
commitdiff
|
tree
2013-03-11
Mikaël
B
arbero
mov
e
load o
n
dema
n
d policy to RCP plugi
n
commit
|
commitdiff
|
tree
2013-03-11
Mikaë
l
B
arbero
remove unused a
n
d depreca
t
ed E
M
FCo
m
pareCo
n
figura
t
ion
commit
|
commitdiff
|
tree
2013-03-11
Mikaë
l
Barbero
fix mo
n
i
t
or issue
.
commit
|
commitdiff
|
tree
2013-03-11
Mikaël B
a
rbe
r
o
refa
c
tor UML plugins to
m
ake all cla
s
ses
i
nternal bef
o
re
.
.
.
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Barbero
[39926
4
] Separa
t
e pure RCP
c
ode from UI and IDE related
.
.
.
commit
|
commitdiff
|
tree
2013-03-11
M
i
kaël
B
arber
o
add Monito
r
to IEObject
M
a
t
ch
e
r
commit
|
commitdiff
|
tree
2013-03-11
Mikaël Barbero
upda
t
e
t
arget d
e
fin
i
tion files to
r
efers to
O
rbit stabl
e
.
.
.
commit
|
commitdiff
|
tree
2013-03-07
Mikaël
B
a
r
bero
a
d
d
tar
g
et platform
definitions f
o
r tests with guava 12+
commit
|
commitdiff
|
tree
2013-03-07
Mika
ë
l
Barbero
[40
1
5
95] Rel
a
x cons
t
ra
i
nt on imported packages from
.
.
.
commit
|
commitdiff
|
tree
2013-03-07
Mik
a
ël
B
arbero
u
s
e L
o
a
d
i
ngC
a
che instead o
f
C
ache
commit
|
commitdiff
|
tree
2013-03-06
Mikaël
Ba
r
bero
change for guava 1
1
commit
|
commitdiff
|
tree
2013-03-05
Mikaël Barbero
u
p
date
v
e
rsion nu
m
ber
r
egardi
n
g the MANIFEST (bis)
commit
|
commitdiff
|
tree
2013-03-05
M
ikaël Barbero
update version numbe
r
regardi
n
g the MANIFEST
commit
|
commitdiff
|
tree
2013-03-05
Mikaël Bar
b
ero
r
e
move deleted plugins from f
e
ature (
b
is)
commit
|
commitdiff
|
tree
2013-03-05
Mik
a
ë
l
Barbero
remove de
l
eted plugins from feature
commit
|
commitdiff
|
tree
2013-03-05
Mikaël Bar
b
e
ro
fix
choco comm
i
t after refactori
n
g of gmf/diagram plu
g
ins
commit
|
commitdiff
|
tree
2013-03-05
M
i
kaël Barbero
chan
g
e dependency from Guava
10
.
0
.
1 to Gua
v
a 11
.
0
.
2
commit
|
commitdiff
|
tree
2013-03-04
Mikaël
Ba
r
bero
fix pare
n
t pom t
o
use
k
epler M
5
targ
e
t definition
commit
|
commitdiff
|
tree
next