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
[521940] Prevent index out of bounds exception on empty SMV tree
2018-05-01
Philip
Langer
[
521940
]
Preve
n
t index o
u
t of boun
d
s
exce
p
tio
n
o
n
em
p
ty
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
hilip Lange
r
SWTUtil
.
sa
f
eRedr
a
w should
c
he
c
k for
d
i
sposed
c
ontrol
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
[52
7
5
6
7] Generalize the table a
n
d tree merge viewe
r
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Ca
m
i
lle Letavernier
[529882] Sync
h
r
o
nize zoom leve
l
s a
n
d all
o
w ch
a
nging
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip La
n
g
e
r
Improve p
e
rformance of th
e
me
r
ging pr
o
cess
commit
|
commitdiff
|
tree
2018-05-01
Ph
i
l
i
p
L
anger
Improve perfo
r
m
ance of IDi
f
fRe
l
at
i
ons
h
ipComputer imp
l
ementations
commit
|
commitdiff
|
tree
2018-05-01
Phi
l
ip Lan
g
er
Improve p
e
r
f
ormance of AbstractCopyCommand
.
getChangedDi
f
f
s
commit
|
commitdiff
|
tree
2018-05-01
Philip
L
a
n
ger
[527864] Prevent CMV l
i
nes to be broken
a
f
t
er merg
i
ng
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip
La
n
ge
r
[52785
8
] Selecting a
d
iff with
conflicts fail
s
commit
|
commitdiff
|
tree
2018-05-01
Philip Lan
g
er
[5
2
7567] DiagramCompareItemProv
i
derAdapt
e
rFactory s
h
ould
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Lan
g
er
[5
0
8
526] Improve text compare
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
Th
e
s
h
ow merge
consequen
c
e
s
contro
l
is conf
u
si
n
g
whe
n
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
h
i
lip Lang
e
r
EMFCompareStructureMer
g
eViewer does much
r
ed
u
ndant
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip
Langer
Supp
o
rt key bindings fo
r
commonly
used merge/
n
aviga
t
e
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip Langer
I
mprove Ma
n
yStructuralFeatureAc
c
essorIm
p
l
.
getDiffWithVa
l
ue
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Phili
p
Langer
Impr
o
ve
I
Merg
e
r registry
implementation
commit
|
commitdiff
|
tree
2018-05-01
Philip
Langer
Improve
p
erformance of te
x
t
ual value mat
c
hing
commit
|
commitdiff
|
tree
2018-04-30
Phi
l
ip Langer
Improve
performance of Co
m
parisonSpec
commit
|
commitdiff
|
tree
2018-04-30
Philip Langer
Avoid e
x
pensive notification
s
processing
a
fter
compare
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
P
hilip La
n
g
e
r
Decrea
s
e progre
s
s monitoring o
v
erh
e
ad
commit
|
commitdiff
|
tree
2018-04-30
P
hilip Langer
Abs
t
ractStructuralFea
t
u
r
eAccess
o
r
.
c
o
mputeDiff
e
rences
.
.
.
commit
|
commitdiff
|
tree
2018-04-30
P
hilip Lan
g
er
Cache Structu
r
eM
e
rgeViewerFilter
results
commit
|
commitdiff
|
tree
2018-04-25
P
h
ili
p
L
a
ng
e
r
[522422] Label-based conte
n
t v
i
e
w
er should clean up
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
Philip Langer
[521948] Support changing the state of
diffs alre
a
dy
.
.
.
commit
|
commitdiff
|
tree
2018-04-19
Phili
p
Langer
[5
1
6248] Improve Na
v
igatable
cac
h
ing
commit
|
commitdiff
|
tree
2018-04-19
Martin
F
le
c
k
[
5
16248
]
A
c
tions f
o
r previous/next unre
s
olved c
h
ange
commit
|
commitdiff
|
tree
2018-03-19
L
a
uren
t
Goubet
Proxy loading from the merge tool
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
Al
l
o
w
p
r
o
xy resoluti
o
n
f
r
om the EMF C
o
mpare co
n
tent
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laure
n
t Goubet
Allow proxy resolution from the EMF Compare structure
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Philip L
a
n
ger
Allo
w
l
o
ading referenced resou
r
ces after
t
he
c
omparison
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laur
e
nt Goubet
SMV action
t
o reveal al
l
dif
f
er
e
nc
e
s
in
conflict with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laure
n
t Goube
t
Add
a
ctio
n
s
t
o merg
e
everything t
o
"get r
i
ght
"
o
r
.
.
.
commit
|
commitdiff
|
tree
2018-03-15
Philip Lang
e
r
[521886] Intr
o
duce action to resolve multiple c
o
nflicts
commit
|
commitdiff
|
tree
2018-03-13
Phil
i
p Langer
[
521886] Avoid v
a
lid
a
tion
in
E
MFComp
a
r
e
E
ditin
g
Domain
commit
|
commitdiff
|
tree
2018-03-13
Laure
n
t Goubet
No c
h
anges shown wh
e
n
t
h
e
r
e is an added Siri
u
s
diagra
m
commit
|
commitdiff
|
tree
2018-03-13
L
a
urent Goubet
Memory lea
k
from
t
he EMFMo
d
elProvider
.
context
T
oRes
o
urce
M
a
p
pi
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
L
a
uren
t
Goubet
Mem
o
ry leaks
w
hen
c
o
mparing Siri
u
s
d
iagrams
commit
|
commitdiff
|
tree
2018-03-13
lgo
u
bet
Removin
g
the su
b
versive integration
plugi
n
s
commit
|
commitdiff
|
tree
2018-03-13
Laurent Gou
b
et
XMI
files are not always models
commit
|
commitdiff
|
tree
2018-03-13
L
aurent Goub
e
t
Memor
y
l
eak
d
uring automatic merge op
e
rations from
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goubet
Don't
return null
f
rom ITyped
E
lement
.
getName()
.
commit
|
commitdiff
|
tree
2018-03-12
Lauren
t
Goubet
[532069] In
v
ali
d
lo
g
ical
m
odel for Synchronize w
i
th
.
.
.
commit
|
commitdiff
|
tree
2018-02-05
C
hristian W
.
Da
m
u
s
[52
2
06
4
] P
r
ofil
e
-ap
p
lication version ch
e
c
k too restrictive
.
.
.
commit
|
commitdiff
|
tree
2018-02-02
Philip Lange
r
Add
pro
g
ress r
e
p
orting for post processor
s
commit
|
commitdiff
|
tree
2018-01-30
l
go
u
bet
Bump plugin and feature versions for Photon
commit
|
commitdiff
|
tree
2018-01-24
Arthur Daussy
[530250] Fix RecursiveModel
M
e
rger to be ab
l
e
to handle
.
.
.
commit
|
commitdiff
|
tree
2018-01-24
lgoub
e
t
Removing the Papyrus plugins
a
n
d features from
the
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
A
n
t
onio
C
ampesino
[525
5
5
7] Rigth Taversal ov
e
rride
w
ith
B
ase
t
r
a
ve
r
s
al
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Laurent Goubet
API br
e
ak
in
J
G
i
t 4
.
9 due t
o
the fix
f
o
r
bug
5
17128
commit
|
commitdiff
|
tree
2017-09-08
A
lexandra Buzila
[
5
13931] F
i
x
Deadlock
i
n Structu
r
e
Me
r
geVie
w
e
r
commit
|
commitdiff
|
tree
2017-09-08
Lau
r
en
t
Goube
t
[510
4
20]
A
ddin
g
mis
s
ing extens
i
on point definitions
.
.
.
commit
|
commitdiff
|
tree
2017-09-08
Mart
i
n
Fle
c
k
[5189
5
7
]
R
e
use Sema
n
ticUMLContentProvider instance
.
.
.
commit
|
commitdiff
|
tree
2017-09-08
P
hilip Langer
Avoid NPE
in
MatchUt
i
l and IOOB in ReferenceChangeMerger
commit
|
commitdiff
|
tree
2017-09-08
Philip Lan
g
e
r
[515581] M
a
ke test pl
u
g-i
n
s a
v
ailable from
t
h
e update
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Ma
r
tin Fl
e
ck
[
5
16060] O
p
a
q
ue Actio
n
Body conflict r
e
solution resu
l
ts
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
L
aurent
G
o
u
bet
[515
5
91] Try an
d
fix r
a
ndom test failures
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[518572
]
Navigata
b
le shou
l
d use content p
r
o
vider to
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
M
a
t
hieu C
a
rtaud
[5
1
8760] Remove legacy JUnit3 artefa
c
ts
commit
|
commitdiff
|
tree
2017-09-07
Mar
t
in Fleck
[
518968] Only tr
a
v
e
rse and cache
n
e
cessary P
a
p
y
rus
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Mar
t
in Fleck
[51
8
983]
CompareInputAdapter
should cache ancestor
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Mar
t
in
Fle
c
k
[
518986] Title of compare edit
o
r should be com
p
uted
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Mart
i
n
F
l
eck
[519003] E
n
sure undo/redo is
activate when SMV h
a
s
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Laurent Goubet
per
f
ormanc
e
plugin
i
ssues
commit
|
commitdiff
|
tree
2017-09-05
Mat
h
ieu
Carta
u
d
[
462863] Staging Pr
o
mpt after Resolving Conflicts
commit
|
commitdiff
|
tree
2017-09-05
Ma
r
tin Fl
e
ck
[518981] Always use s
p
ecialized
l
og
i
c when using Re
v
isi
o
n
edU
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Ma
r
tin Fleck
[519025]
O
nly con
s
i
der references when finding stereotype
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
L
a
urent Goub
e
t
[52135
8
] documentation for
EMFCo
m
pareRCPPlu
g
in
m
issing
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Christian W
.
Damus
[520105] [Tests] Maven
exe
c
ution
o
f Git te
s
ts
fail
s
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
La
u
r
e
n
t
Goub
e
t
Bumping
versions for Ox
y
gen
.
1
commit
|
commitdiff
|
tree
2017-08-23
Laurent Goubet
Remov
i
ng non
function
a
l pr
o
fi
l
es from pom
commit
|
commitdiff
|
tree
2017-08-22
La
u
rent Goubet
Separ
a
te
core & extra builds
commit
|
commitdiff
|
tree
2017-07-21
Martin Fleck
Relax Compare Con
s
ideration
s
of
I
MergeViewerItems
commit
|
commitdiff
|
tree
2017-07-20
Philip Langer
A
dd a few miss
i
n
g
licens
e
headers
commit
|
commitdiff
|
tree
2017-07-07
Philip Lan
g
er
Refactorings to improve perform
a
nce of
Match
U
til
commit
|
commitdiff
|
tree
2017-07-07
Laurent Goubet
[518612] Freq
u
ent CME
from the
a
dapter factory d
i
sposal
commit
|
commitdiff
|
tree
2017-07-07
Martin Fleck
[51897
9
] Remove context entries with
an empty cac
h
e
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin
F
leck
[519016]
Avoid
r
epe
a
ted
resour
c
e tra
v
ersal when resolving
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Marti
n
F
l
eck
[51
9
033] D
o
not refresh the S
M
V viewer after every
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Mar
t
in F
l
e
c
k
[519
0
23] Ch
e
ck cancellation
less
f
requentl
y
in conflict
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Ph
i
l
ip Langer
[516524] Use more efficien
t
f
e
ature loo
k
-up in ReferenceUtil
commit
|
commitdiff
|
tree
2017-07-06
C
h
ristian
W
.
Damus
[519261] [Oom
p
h] Setup model problems for
O
xygen
commit
|
commitdiff
|
tree
2017-07-06
Christian W
.
Damus
[
519170
]
[Che
c
kstyle]
Author
f
o
rm
a
t constraint
is too
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Chris
t
ia
n
W
.
Da
m
us
[519227] [Chec
k
sty
l
e] St
y
l
e
errors in oee
.
com
p
are bundle
commit
|
commitdiff
|
tree
2017-07-06
Laurent Goubet
Use the released version of
EGit
commit
|
commitdiff
|
tree
2017-06-29
Antonio Cam
p
esino
Bug 518608 - Dup
l
icated / Mixe
d
Stage
not allowe
d
ex
c
e
p
tion
.
.
.
commit
|
commitdiff
|
tree
2017-06-27
M
artin
Fleck
[487151] Accept all non-conflicting
c
hanges f
a
ils to
.
.
.
commit
|
commitdiff
|
tree
2017-06-27
Ma
r
tin
F
leck
[514415] Relationships be
t
ween
dif
f
s
s
hould be cached
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[
51
4
7
67] Provide
p
r
e
f
erences to con
f
i
g
ure
c
ompari
s
on
.
.
.
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[507157] Chec
k
u
s
age of InputStreams wi
t
h mock
i
to
commit
|
commitdiff
|
tree
2017-06-26
Ma
r
tin Fleck
[512677]
R
egis
t
er E
M
FModelProvider for new Papyrus
.
.
.
commit
|
commitdiff
|
tree
2017-06-26
M
a
rtin Fl
e
ck
[51
4
382] P
r
e
-Merg
e
on con
f
l
ict can lead to d
a
ta los
s
commit
|
commitdiff
|
tree
2017-06-26
Martin
Fl
e
c
k
[5
1
4079
]
Impl
e
ment Mir
r
oring: Swap left/right side
.
.
.
commit
|
commitdiff
|
tree
2017-06-12
L
au
r
e
n
t Goubet
"spy"ing is
t
he root c
a
use of a huge memory
l
eak
commit
|
commitdiff
|
tree
2017-06-06
Laurent
G
oubet
Revert
"Refa
c
to
r
ings to im
p
rove per
f
ormance o
f
M
atchUti
l
"
commit
|
commitdiff
|
tree
2017-06-06
Laurent Goubet
Revert "Us
e
mo
r
e effic
i
ent feature look-up i
n
ReferenceUtil"
commit
|
commitdiff
|
tree
2017-06-06
Phi
l
ip Lange
r
Update Oxygen
t
arget to new SysML 1
.
1 update site
commit
|
commitdiff
|
tree
2017-05-12
P
hilip
L
anger
[516
5
08
]
C
a
che un
r
e
s
ol
v
abl
e
proxies i
n
NotLoadi
n
gRes
o
urceSet
commit
|
commitdiff
|
tree
2017-05-12
Philip Langer
[516520] A
v
o
i
d un
n
ecessar
y
not
i
ficati
o
ns
o
f co
m
parison
.
.
.
commit
|
commitdiff
|
tree
2017-05-11
Laurent Goubet
[5163
4
5] Inconsisten
c
y w
i
th the
l
og
i
c
a
l
model
r
es
o
lution
commit
|
commitdiff
|
tree
2017-05-11
Laure
n
t
G
o
u
bet
Compatibility with
guava 21
commit
|
commitdiff
|
tree
next