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
Fix some of the warnings
2015-05-05
Lauren
t
Goub
e
t
Fi
x
s
ome of the warnings
commit
|
commitdiff
|
tree
2015-05-04
Philip Langer
[465331
]
Delega
t
e file ad
d
itions and
deletion
s
if m
i
ssed
.
.
.
commit
|
commitdiff
|
tree
2015-05-04
Laure
n
t Dela
i
gue
Introduce
logging with log
4
j
.
commit
|
commitdiff
|
tree
2015-04-30
Philip Lan
g
er
[465329] Ad
d
s test for merging new dependen
t
but
no
t
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
Philip Langer
Extract common super
cl
a
ss from git tests regarding
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
Ph
i
l
i
p Langer
[465329
]
Return the
U
RI of the resou
r
ce t
o
b
e
created
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
Laure
n
t De
l
a
igue
[460773]
L
isten to
r
esource
cr
e
a
tion d
u
ring merge
.
commit
|
commitdiff
|
tree
2015-04-14
Laurent Goub
e
t
Introdu
c
e gi
t
-specific support to f
i
x
unusea
b
l
e
storage
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-04-07
A
xel
Richard
[463445] Fi
x
pot
e
ntial NPE in EMFCompar
e
StructureMerg
e
Vi
e
wer
commit
|
commitdiff
|
tree
2015-04-07
Stefan Dir
i
x
U
p
d
ate Match
i
ng Chapter
in
Developer Documentatio
n
commit
|
commitdiff
|
tree
2015-04-07
Axel Ric
h
a
r
d
[462550] Fix resou
r
ceSetHook
ext
e
nsion-pont ID
commit
|
commitdiff
|
tree
2015-03-04
Ax
e
l R
i
c
hard
[45
8
963] EMFCompare object
doesn't use EMFCompare
R
CP
.
.
.
commit
|
commitdiff
|
tree
2015-02-18
S
t
efan Dirix
[452147] Fix
handling
of
d
i
ffs
f
or interlocked
one
.
.
.
commit
|
commitdiff
|
tree
2015-02-10
Laurent Goubet
Provide coherent
n
a
mes for the SDK features
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-02-09
Laure
n
t Goubet
Ch
a
nge featur
e
names to more descriptive ones
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[
4
36050]
F
ix co
p
y all does nothing
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[
456
7
96
]
Cascadin
g
filt
e
r
shouldn't hide m
o
ve differences
commit
|
commitdiff
|
tree
2015-02-09
Axel Rich
a
rd
[413
0
38] Fix P
r
operties View:
e
dit a value changes
.
.
.
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[45913
1
] Fix
L
ogical Model Resources Graph
u
pd
a
t
e
commit
|
commitdiff
|
tree
2015-02-03
L
a
u
r
e
nt De
l
aigue
[
4
585
0
2] NPE in EMFCompareStructureMergeViewer
.
commit
|
commitdiff
|
tree
2014-12-18
A
x
e
l Richard
Update developer guide
commit
|
commitdiff
|
tree
2014-12-17
Axel Ric
h
ard
S
i
mplification of DependencyData
commit
|
commitdiff
|
tree
2014-12-17
Axel Richard
[447231] DifferenceGroup:
d
on't build a sub tr
e
e if
.
.
.
commit
|
commitdiff
|
tree
2014-12-16
Axel Richard
Notify resources when running merge
all non co
n
flicting
.
.
.
commit
|
commitdiff
|
tree
2014-12-16
A
x
el Richar
d
[Logical Model View]
Use
o
ur ow
n
synce
d
icon
commit
|
commitdiff
|
tree
2014-12-12
Axel Ri
c
h
ard
[454735] ExpandCollapseListener raises potential NPE
commit
|
commitdiff
|
tree
2014-12-12
Axel R
i
chard
Fix Undo for ContentMergeViewe
r
s
commit
|
commitdiff
|
tree
2014-12-12
Axel Richard
F
ix random order of ResourcesAtta
c
hmentChanges in SMV
commit
|
commitdiff
|
tree
2014-12-11
Axe
l
R
ichard
R
e
sourcesAtt
a
c
hmentCh
a
nges
m
u
st be filter
e
d in group
s
commit
|
commitdiff
|
tree
2014-12-11
Axel
R
ichard
Don'
t
clean event
b
us
i
n compare
c
onfigura
t
ion
commit
|
commitdiff
|
tree
2014-12-11
A
x
el Richard
Fix M
e
r
g
e
Al
l
T
o
olba
r
Ac
t
ions
commit
|
commitdiff
|
tree
2014-12-10
L
a
urent Go
u
be
t
Pro
p
e
r
l
y dis
p
ose our group providers
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Gou
b
e
t
D
ispos
e
of the content viewers
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goube
t
N
u
ll ou
t
ou
r
undo/r
e
d
o actions (r
e
f
e
renc
e
to domain)
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Reduce th
e
numbe
r
of loop
s
from difference gr
o
up
creation
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-08
Laurent Goube
t
Ma
t
ch pe
r
forma
n
ce w
h
en u
s
i
ng only id
e
n
t
ifier
s
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-04
Axel Ri
c
hard
[442897] P
s
e
u
do confl
i
cts under Real Add conflict
s
commit
|
commitdiff
|
tree
2014-11-21
Laur
e
nt Goubet
F
i
x javado
c
of
t
he EMFModelProvider t
o
reflec
t
current
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
L
aurent Goubet
[4
4
91
6
2] Fix Illega
l
S
t
ateEx
c
eptio
n
: The resource set
.
.
.
Also-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-07
Axel R
i
c
hard
[44
9
162] Fix IllegalStateException: The resour
c
e set
.
.
.
Also-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-07
La
u
rent Goubet
Add missing copy
r
ights
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
B
u
mp vers
i
ons and fix new p
l
u
g
ins for M
a
rs M3
commit
|
commitdiff
|
tree
2014-11-04
Alexandra Buz
i
la
[
4
46
2
52] Issue with
featur
e
ordering when me
r
ging Feat
u
re
M
a
ps
commit
|
commitdiff
|
tree
2014-10-29
A
l
exand
r
a Buzila
[448464] Sourc
e
list i
n
corre
c
tly determined whe
n
undoing
.
.
.
commit
|
commitdiff
|
tree
2014-10-22
Mikaël Barb
e
ro
F
i
x t
h
e lab
e
ls of the SM
V
t
i
tle bar
commit
|
commitdiff
|
tree
2014-10-22
Mikaël Bar
b
ero
Parameterize p
r
oj
e
c
t name a
n
d project id t
o
ease reu
s
e
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Art
h
ur
D
a
u
ssy
Unloads UML
reso
u
rc
e
s
thanks to the
r
e
so
u
rce
set hooks
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Arthu
r
Daussy
P
r
events scope to fi
l
ter resources using pathmap
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daus
s
y
Add
s
onDispose method
o
n t
h
e r
e
s
ou
r
ce set hooks
.
commit
|
commitdiff
|
tree
2014-10-14
P
h
ilip Lange
r
[4467
3
9] Fixes
obt
a
ining
the target feature in thr
e
e
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur D
a
ussy
Corrects labels af
t
er
enhancemen
t
on
con
f
licts label
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Dauss
y
[3
9
8367] Adds Pa
p
yru
s
CSS
customization support
.
commit
|
commitdiff
|
tree
2014-10-14
A
rthur Dauss
y
Adds ResourceS
e
tHook extensio
n
point
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daussy
Prevent
s
loading
t
w
i
ce the same model in a
NotLoad
i
ngResourc
.
.
.
commit
|
commitdiff
|
tree
2014-10-13
Arthur Daussy
[443337
]
Prevent large shapes icons
for stereotypes
.
commit
|
commitdiff
|
tree
2014-10-13
Arth
u
r
D
aussy
[44641
3
] St
r
uctur
e
M
e
r
g
eVi
e
wer should rebu
i
ld its tre
e
.
.
.
commit
|
commitdiff
|
tree
2014-10-10
Laurent Goubet
Modify me
r
ge t
o
handle impl
i
cations properly
commit
|
commitdiff
|
tree
2014-09-29
Arthur Daussy
EGit
behavio
r
change
commit
|
commitdiff
|
tree
2014-09-25
Ax
e
l Richard
[
4
4
3031
]
F
ix NPE on Feat
u
reFilter
.
re
f
er
e
n
c
eIsSet
commit
|
commitdiff
|
tree
2014-09-25
Axel Richard
[
443968] Fix NPE i
n
C
o
mparison
U
tils
.
get
S
ubDiff
s
commit
|
commitdiff
|
tree
2014-09-25
A
r
thur Daussy
[4434
2
0] Ha
n
d
le not integ
r
a
te
d
dyna
m
ic
profile
.
commit
|
commitdiff
|
tree
2014-09-25
Axel
Richa
r
d
[404811]
E
xpand group ite
m
on double-click
commit
|
commitdiff
|
tree
2014-09-25
Ax
e
l Richard
[44
1
754]
T
he default
activated group is bui
l
t
t
wic
e
commit
|
commitdiff
|
tree
2014-09-25
Axel Richar
d
[443696] A
d
d
contextual m
e
nu on differ
e
nces
in SMV
commit
|
commitdiff
|
tree
2014-08-22
L
aurent Goubet
Fix m
e
rg
e
-related UI feedback of th
e
Struc
t
ure v
i
ewer
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-08-20
La
u
rent Goubet
Only merge th
e
'
m
an
y
' side
of an
equivalence in case
.
.
.
commit
|
commitdiff
|
tree
2014-08-19
A
rthur Daussy
[434621] Corr
e
ction on RootID
M
a
t
ching
strat
e
gy
.
commit
|
commitdiff
|
tree
2014-08-05
P
h
ilip Lan
g
e
r
[413520] Fixes IndexOutOfBoun
d
sE
x
ce
p
t
i
on on m
e
r
ging
.
.
.
commit
|
commitdiff
|
tree
2014-08-01
Arthur Dau
s
sy
C
orrects possible
N
PE on
r
esource
resolv
i
ng
.
commit
|
commitdiff
|
tree
2014-07-08
Laure
n
t Goubet
The logic
a
l model should find incoming cross-references
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
Bump
versions to 3
.
1
.
0 on
m
aster
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
delete leg
a
c
y plugin
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
remove legacy (and unbuild
a
b
le) s
y
s
m
l
s
upp
o
rt
commit
|
commitdiff
|
tree
2014-06-23
Ar
t
hur
D
aussy
A
d
d
Stereotyped element change to the UML Com
p
are meta
.
.
.
commit
|
commitdiff
|
tree
2014-06-20
Arthu
r
D
a
ussy
G
e
nerates UMLComp
a
re so
u
rce code
w
ith
EMF 2
.
1
0
commit
|
commitdiff
|
tree
2014-06-20
Arthur Daussy
Unit test f
o
r MDT Papyrus difference
s
order
.
commit
|
commitdiff
|
tree
2014-06-16
Arthur Daussy
Avoid u
n
ne
c
essa
r
y
d
i
alog whe
n
commit
i
n
g
non fragmented
.
.
.
commit
|
commitdiff
|
tree
2014-06-11
L
aurent Goubet
avoid infinite looping from git when resolving fails
commit
|
commitdiff
|
tree
2014-06-03
Laurent Goubet
various
s
onar violations f
i
xes
commit
|
commitdiff
|
tree
2014-06-02
Mikaë
l
Barbero
A
d
d transaction
a
l co
m
p
a
r
e com
m
and
s
tack
commit
|
commitdiff
|
tree
2014-06-02
Mikaël Barbero
Remov
e
dea
d
code
commit
|
commitdiff
|
tree
2014-06-02
Mikaël Barbero
Add model resource tex
t
cont
e
nt merge viewer
t
o diagr
a
m
commit
|
commitdiff
|
tree
2014-06-02
Mikaël
B
arbe
r
o
update problem indic
a
tion from a single lo
c
atio
n
commit
|
commitdiff
|
tree
2014-06-02
Mikaël
Barbero
Let the u
s
er
s
witch to te
x
t compare
from no
d
i
fference
.
.
.
commit
|
commitdiff
|
tree
2014-06-02
Laurent Goubet
Add Gu
a
va 15 to the ac
c
e
p
ted ran
g
e
commit
|
commitdiff
|
tree
2014-05-28
Mikaël
B
arbe
r
o
U
se co
m
pare
configuration labels
for s
i
de groups t
i
t
l
e
.
commit
|
commitdiff
|
tree
2014-05-28
M
i
kaël Barbero
Exc
e
p
t
i
o
n ca
n
't be added
t
o
prob
l
em vie
w
, w
e
have to
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Mikaël Barbero
Avoi
d
to dispatch
n
ot
i
fic
a
t
ion to fix d
e
adlo
c
k with
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Mikaël Bar
b
ero
Properly shutdown de
l
ayed executor
s
ervice
commit
|
commitdiff
|
tree
2014-05-28
Mikaël Ba
r
bero
Add support for a new content viewe
r
t
o fall
b
a
ck to
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Laurent Goubet
Lim
i
t scope of res
o
ur
c
e
d
e
lta r
e
a
c
tions in the resolver
commit
|
commitdiff
|
tree
2014-05-22
Mikaël B
a
rbero
[435483] Check for disposal of
widgets before report
i
ng
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Laurent
G
o
ubet
try and handle git local revisions
d
uring compar
i
son
commit
|
commitdiff
|
tree
2014-05-20
La
u
rent G
o
ube
t
"OK" status
s
h
o
uld still display t
h
e
comparison
commit
|
commitdiff
|
tree
2014-05-20
Mikaël
Barbe
r
o
Add fallb
a
ck to text when something goes wrong during
.
.
.
commit
|
commitdiff
|
tree
2014-05-19
Lau
r
ent Go
u
bet
temp
o
ra
r
y im
p
le
m
ent equ
a
ls for the EMFRes
o
u
r
c
e
M
apping
commit
|
commitdiff
|
tree
2014-05-19
Mikaël Barbero
Avoi
d
NPE
in
diagnostic vie
w
er
commit
|
commitdiff
|
tree
2014-05-19
M
ikaël Ba
r
be
r
o
More gracefu
l
shutdown of
t
hr
e
ads po
o
l
.
commit
|
commitdiff
|
tree
2014-05-16
Mik
a
ël Barbero
Do not rethrow exce
p
tion
w
h
en lo
a
ding a resource in
.
.
.
commit
|
commitdiff
|
tree
2014-05-16
M
i
kaël Barbero
I
m
p
r
o
v
e progress reporting
commit
|
commitdiff
|
tree
next