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
Proper loading of the profiles and packages from the SRS
2015-06-08
Laurent Goubet
P
r
oper lo
a
ding of the
profiles and
p
a
ckages
f
rom the SRS
commit
|
commitdiff
|
tree
2015-06-08
Laure
n
t G
o
ubet
Re
s
t
ore cac
h
ing of the logical
m
o
d
e
l
commit
|
commitdiff
|
tree
2015-06-01
Axel Richard
Happy
C
heckstyle
commit
|
commitdiff
|
tree
2015-06-01
Laurent Delaigue
Unit
tests for resour
c
e locatio
n
changes
.
commit
|
commitdiff
|
tree
2015-06-01
Axel R
i
chard
Add
s
Q7 test
for
UML p
r
ofil
e
s
.
commit
|
commitdiff
|
tree
2015-06-01
Mi
c
ha
e
l
Bor
k
owski
[
4
67
5
7
6
]
Co
r
r
ect Ha
n
d
li
n
g
of Proxies in
R
eqEn
g
ine
commit
|
commitdiff
|
tree
2015-05-18
Axel Ric
h
ard
[Doc] Upda
t
e use
r
guide
commit
|
commitdiff
|
tree
2015-05-06
L
a
urent Goubet
signing
i
ssues
commit
|
commitdiff
|
tree
2015-05-06
Laurent
G
oubet
sig
n
i
ng issues
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goubet
signi
n
g iss
u
es
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goubet
signing
i
ssues
commit
|
commitdiff
|
tree
2015-05-06
L
a
urent
Goubet
signing failures
commit
|
commitdiff
|
tree
2015-05-05
Laurent Goubet
Fix some of th
e
warn
i
n
g
s
commit
|
commitdiff
|
tree
2015-05-04
P
h
ili
p
L
ang
e
r
[
465331] Delegate file ad
d
itions an
d
delet
i
ons
if mi
s
sed
.
.
.
commit
|
commitdiff
|
tree
2015-05-04
Laurent Delaigue
Introduce logging with
l
og4j
.
commit
|
commitdiff
|
tree
2015-04-30
Ph
i
lip Langer
[465329
]
Adds test for mergin
g
n
ew
dependent but not
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
Philip Langer
Ext
r
act
common sup
e
r class from g
i
t tests regardi
n
g
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
Phil
i
p Lan
g
e
r
[4
6
5329
]
Retur
n
the U
R
I of the reso
u
rce to be crea
t
e
d
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
Lauren
t
De
l
a
i
gue
[460773
]
L
i
s
ten to re
s
ou
r
ce
c
reation during merg
e
.
commit
|
commitdiff
|
tree
2015-04-14
Lau
r
ent
G
o
u
bet
Intro
d
uce git-specific
su
p
port to f
i
x unus
e
a
b
le stor
a
ge
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-04-07
Axel Ric
h
a
r
d
[463445] Fix potential NPE
in
E
MFCompareStructureMerg
e
Viewer
commit
|
commitdiff
|
tree
2015-04-07
Stefan Dirix
Upd
a
te Mat
c
h
i
ng
C
hapter in
D
eveloper
Doc
u
me
n
tation
commit
|
commitdiff
|
tree
2015-04-07
Axel
Richard
[46255
0
]
Fix reso
u
rceSet
H
ook extension-
p
ont
I
D
commit
|
commitdiff
|
tree
2015-03-04
Axel Ric
h
ard
[
4
5
8963
]
EMFCompare
o
b
ject doesn't
use
E
M
F
CompareRCP
.
.
.
commit
|
commitdiff
|
tree
2015-02-18
S
tefan Dirix
[4521
4
7
] Fix hand
l
ing of diffs for interlocked one
.
.
.
commit
|
commitdiff
|
tree
2015-02-10
Laur
e
nt Goubet
P
r
ovide coherent n
a
mes for
t
he
SDK
feature
s
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-02-09
Laurent Goubet
C
hange
f
e
a
ture names to mo
r
e descriptive o
n
e
s
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-02-09
A
xel Richard
[436050] Fix c
o
py a
l
l
d
oes
n
othi
n
g
commit
|
commitdiff
|
tree
2015-02-09
Axel Ric
h
a
rd
[456796] Cas
c
ading filter
shouldn't hide
m
ove difference
s
commit
|
commitdiff
|
tree
2015-02-09
Ax
e
l Richard
[413038] Fix P
r
operties View: edit a value
changes
.
.
.
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[459
1
31] Fix L
o
gic
a
l Model Resources Graph update
commit
|
commitdiff
|
tree
2015-02-03
Laurent
D
el
a
igue
[458
5
02]
NP
E
in EMFComp
a
reStructureMergeView
e
r
.
commit
|
commitdiff
|
tree
2014-12-18
Axel Richa
r
d
Update developer guide
commit
|
commitdiff
|
tree
2014-12-17
Axel Rich
a
rd
Simplification of Dependen
c
yData
commit
|
commitdiff
|
tree
2014-12-17
Axel Ric
h
ard
[447231] DifferenceGroup: do
n
't bui
l
d a sub tr
e
e if
.
.
.
commit
|
commitdiff
|
tree
2014-12-16
Axel
Ric
h
ard
Notify reso
u
rce
s
when runni
n
g merg
e
a
l
l non conflict
i
ng
.
.
.
commit
|
commitdiff
|
tree
2014-12-16
Axel Ri
c
hard
[
L
ogic
a
l
Mode
l
View] Use
our
o
wn synced
i
con
commit
|
commitdiff
|
tree
2014-12-12
Ax
e
l Richard
[
4
54735] Expand
C
ollapseListener r
a
is
e
s potential
NPE
commit
|
commitdiff
|
tree
2014-12-12
Axel R
i
chard
Fix Undo for Conten
t
MergeViewers
commit
|
commitdiff
|
tree
2014-12-12
Axel Richard
Fix random order of Re
s
ourcesAttac
h
m
e
ntChanges in SMV
commit
|
commitdiff
|
tree
2014-12-11
Axel Richard
Resourc
e
sAttachmen
t
Changes must be filtered in g
r
o
ups
commit
|
commitdiff
|
tree
2014-12-11
A
xel
R
ichard
Don't clea
n
eventbus in
compare config
u
ratio
n
commit
|
commitdiff
|
tree
2014-12-11
Axel Richard
Fix MergeAll Too
l
ba
r
A
c
tions
commit
|
commitdiff
|
tree
2014-12-10
Laurent Goubet
Pro
p
erl
y
dispose our grou
p
providers
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Gou
b
et
Dispose of the con
t
ent viewers
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Lau
r
ent Goubet
Null out our undo/redo actions (r
e
ference to doma
i
n
)
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Reduc
e
th
e
nu
m
ber of loops from
diffe
r
ence
group cr
e
at
i
on
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-08
Laurent Goub
e
t
Match performanc
e
when using only
i
dent
i
fiers
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-04
Axel Richard
[442897] Pseudo conf
l
icts
u
nder Real Add conflic
t
s
commit
|
commitdiff
|
tree
2014-11-21
Laurent
G
oubet
F
i
x javadoc of the EM
F
M
o
delProvider to reflect curren
t
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
[449162] Fix Ill
e
ga
l
StateExc
e
ption: The resource
s
et
.
.
.
Also-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-07
A
x
el R
i
cha
r
d
[
4
49162] Fix
I
llegalS
t
a
t
eException: The reso
u
rce set
.
.
.
Also-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
Add missing
c
o
py
r
ights
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
Bump ver
s
ions a
n
d fix n
e
w
plugins for Mars M3
commit
|
commitdiff
|
tree
2014-11-04
Alexandra Buzila
[446252] Issu
e
with f
e
ature
orderi
n
g when merging Featur
e
Map
s
commit
|
commitdiff
|
tree
2014-10-29
Al
e
xa
n
dra Buzila
[
448464] Source list incorrectl
y
d
e
termined
w
hen und
o
ing
.
.
.
commit
|
commitdiff
|
tree
2014-10-22
Mikaël Bar
b
ero
Fi
x
the labels of
t
he SM
V
title bar
commit
|
commitdiff
|
tree
2014-10-22
Mikaël Barbero
Para
m
eterize
p
r
o
ject n
a
me and project id to eas
e
reuse
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur D
a
ussy
Un
l
o
ad
s
UML
r
e
s
ources
t
han
k
s to t
h
e resou
r
ce set hoo
k
s
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
thur Dau
s
sy
Prevents scope to filter resources usi
n
g pathmap
.
commit
|
commitdiff
|
tree
2014-10-14
Art
h
ur Daus
s
y
Adds onDispose
method on
the
r
esource set
ho
o
k
s
.
commit
|
commitdiff
|
tree
2014-10-14
Philip
Langer
[446739] Fixes obtaining the tar
g
et
feature
i
n
t
hree
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
thur D
a
ussy
Corre
c
ts
l
abels after enh
a
n
c
ement on
co
n
fli
c
t
s l
a
bel
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Da
u
ssy
[
398367] Add
s
Papyrus CSS customizatio
n
s
upport
.
commit
|
commitdiff
|
tree
2014-10-14
Art
h
ur Daussy
Adds ResourceSetHook extensi
o
n point
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Dauss
y
Pr
e
vents loading
twice the same m
o
del in a NotLoadingResour
c
.
.
.
commit
|
commitdiff
|
tree
2014-10-13
Arthur
Daussy
[4433
3
7] Prev
e
nt large s
h
apes icons for stereo
t
y
p
e
s
.
commit
|
commitdiff
|
tree
2014-10-13
Arthur Daussy
[446413] Stru
c
tureMergeViewer should reb
u
i
ld
i
ts tree
.
.
.
commit
|
commitdiff
|
tree
2014-10-10
Lauren
t
Goubet
Modify merge to handle implications properly
commit
|
commitdiff
|
tree
2014-09-29
Arthur Daussy
E
G
it b
e
havior change
commit
|
commitdiff
|
tree
2014-09-25
A
x
e
l Richard
[443031
]
Fix NPE on FeatureFilter
.
refere
n
ceIsSet
commit
|
commitdiff
|
tree
2014-09-25
Axel R
i
chard
[443968]
Fix NPE in Compar
i
s
o
nU
t
ils
.
getSub
D
i
f
f
s
commit
|
commitdiff
|
tree
2014-09-25
Arthur Da
u
ssy
[443420]
H
a
ndle not in
t
e
g
rated dy
n
amic profile
.
commit
|
commitdiff
|
tree
2014-09-25
Axel Richard
[404
8
11] Expan
d
group ite
m
o
n do
u
ble-click
commit
|
commitdiff
|
tree
2014-09-25
A
xel
Richard
[44
1
754] The defau
l
t activated group is
b
uilt twice
commit
|
commitdiff
|
tree
2014-09-25
A
xel Ri
c
hard
[44
3
696] A
d
d con
t
extual m
e
nu on differe
n
ces in SMV
commit
|
commitdiff
|
tree
2014-08-22
Laurent
G
o
u
bet
F
ix merge-rela
t
ed
U
I fe
e
dback of the Struc
t
ure vi
e
wer
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-08-20
Laurent
Goubet
O
nly merge the 'many' side of an
equ
i
valence
in case
.
.
.
commit
|
commitdiff
|
tree
2014-08-19
Arthur Daus
s
y
[434621]
Cor
r
ection on Roo
t
IDMatch
i
ng strategy
.
commit
|
commitdiff
|
tree
2014-08-05
Phili
p
Lang
e
r
[41352
0
] Fixes IndexOutOfBo
u
n
dsException on me
r
ging
.
.
.
commit
|
commitdiff
|
tree
2014-08-01
Arthur Daussy
Corrects possible NPE on res
o
urce resolv
i
ng
.
commit
|
commitdiff
|
tree
2014-07-08
Laurent
Go
u
bet
The logic
a
l model
should
find incomin
g
c
ross-reference
s
commit
|
commitdiff
|
tree
2014-07-01
Laurent
Go
u
b
et
Bump
ver
s
ions to
3
.
1
.
0 on master
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
delete legacy plugi
n
commit
|
commitdiff
|
tree
2014-07-01
Laure
n
t G
o
ubet
remove legacy (and
u
n
b
u
i
ldable) sysml s
u
p
port
commit
|
commitdiff
|
tree
2014-06-23
A
r
thur Dau
s
sy
A
dd S
t
e
r
eotyped
element ch
a
n
ge to the
U
M
L C
o
mpare m
e
ta
.
.
.
commit
|
commitdiff
|
tree
2014-06-20
Arthur
D
a
u
ssy
Generat
e
s U
M
LCompare
source
c
o
d
e
with E
M
F 2
.
10
commit
|
commitdiff
|
tree
2014-06-20
A
r
thur Daussy
Unit
te
s
t for MDT Papyrus
d
iff
e
rences or
d
er
.
commit
|
commitdiff
|
tree
2014-06-16
Arth
u
r Daussy
Avoid u
n
neces
s
a
ry dialog when comm
i
ting n
o
n fr
a
gmented
.
.
.
commit
|
commitdiff
|
tree
2014-06-11
Laurent Goubet
avoid infinite
loop
i
ng from gi
t
w
hen resolving fa
i
l
s
commit
|
commitdiff
|
tree
2014-06-03
Lau
r
ent
G
ou
b
et
various sonar violat
i
ons fixes
commit
|
commitdiff
|
tree
2014-06-02
M
i
kaël Barbero
Add transact
i
onal compare com
m
and stack
commit
|
commitdiff
|
tree
2014-06-02
Mikaël Bar
b
e
r
o
Remove dead code
commit
|
commitdiff
|
tree
2014-06-02
Mikaël Barbero
Add model r
e
source text con
t
ent merg
e
viewe
r
to diagram
commit
|
commitdiff
|
tree
2014-06-02
M
ikaël Barbero
update problem indicati
o
n
f
rom a single location
commit
|
commitdiff
|
tree
2014-06-02
Mikaël Barb
e
ro
Let the user switch to text com
p
are from no difference
.
.
.
commit
|
commitdiff
|
tree
2014-06-02
La
u
rent Goubet
Add Guava 15 to the acce
p
ted r
a
nge
commit
|
commitdiff
|
tree
2014-05-28
M
ikaël
B
a
rbero
Use compare confi
g
uratio
n
l
abels for side
g
roups title
.
commit
|
commitdiff
|
tree
2014-05-28
Mikaël Barbe
r
o
Exception ca
n
't be added to prob
l
em view, we have to
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Mi
k
aël Bar
b
ero
Avoid to dispatch
no
t
i
f
ication t
o
fix de
a
dl
o
ck with
.
.
.
commit
|
commitdiff
|
tree
next