Skip to content

Commit

Permalink
Merge pull request #2487 from mbeddr/bugfix/2468-TraceExplorerRequire…
Browse files Browse the repository at this point in the history 
…sReadAccessForNodeMapping

TraceExplorer: Fixed NPE (#2468)
  • Loading branch information
@mgronover
mgronover authored Aug 21, 2024
2 parents b7eefab + e6693e3 commit e09bdbf
Showing 1 changed file with 70 additions and 38 deletions.
108 changes: 70 additions & 38 deletions ...tions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3168,7 +3168,7 @@
<node concept="2tJIrI" id="T08V6J3cR1" role="jymVt" />
<node concept="3clFb_" id="7rNasV5CUrg" role="jymVt">
<property role="TrG5h" value="showSelectionDialog" />
<node concept="3Tm6S6" id="7rNasV5CUrh" role="1B3o_S" />
<node concept="3Tmbuc" id="6fyeJ0bqx0V" role="1B3o_S" />
<node concept="3cqZAl" id="7rNasV5CUri" role="3clF45" />
<node concept="3clFbS" id="7rNasV5CUpY" role="3clF47">
<node concept="3clFbF" id="T08V6J7PW$" role="3cqZAp">
Expand Down Expand Up @@ -5150,7 +5150,7 @@
<node concept="10P_77" id="7IhZGc$yTRL" role="1tU5fm" />
</node>
<node concept="3cqZAl" id="7IhZGc$yJxr" role="3clF45" />
<node concept="3Tm6S6" id="4SlhOgzL7BJ" role="1B3o_S" />
<node concept="3Tmbuc" id="6fyeJ0bpNXF" role="1B3o_S" />
<node concept="3clFbS" id="7IhZGc$yJxt" role="3clF47">
<node concept="1QHqEK" id="7IhZGc$yXeh" role="3cqZAp">
<node concept="1QHqEC" id="7IhZGc$yXei" role="1QHqEI">
Expand Down Expand Up @@ -6763,7 +6763,7 @@
<node concept="2tJIrI" id="4yQfyMjqHwi" role="jymVt" />
<node concept="3clFb_" id="2JfTTG8lxVb" role="jymVt">
<property role="TrG5h" value="highlightCodeForRec" />
<node concept="3Tm6S6" id="2JfTTG8lxVc" role="1B3o_S" />
<node concept="3Tmbuc" id="6fyeJ0bpskn" role="1B3o_S" />
<node concept="10P_77" id="2JfTTG8lxVd" role="3clF45" />
<node concept="37vLTG" id="2JfTTG8lxV2" role="3clF46">
<property role="TrG5h" value="rec" />
Expand Down Expand Up @@ -6856,43 +6856,78 @@
<node concept="1QHqEK" id="2a_JeWG98Ny" role="3cqZAp">
<node concept="1QHqEC" id="2a_JeWG98N$" role="1QHqEI">
<node concept="3clFbS" id="2a_JeWG98NA" role="1bW5cS">
<node concept="3clFbF" id="1TNXcegQhRB" role="3cqZAp">
<node concept="37vLTI" id="1TNXcegQv0q" role="3clFbG">
<node concept="37vLTw" id="1TNXcegQhRA" role="37vLTJ">
<ref role="3cqZAo" node="2JfTTG8lxUM" resolve="target" />
<node concept="3cpWs8" id="6fyeJ0bjKFa" role="3cqZAp">
<node concept="3cpWsn" id="6fyeJ0bjKFb" role="3cpWs9">
<property role="TrG5h" value="mappedNodeOrGivenNode" />
<node concept="3uibUv" id="6fyeJ0bjK29" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
</node>
<node concept="2OqwBi" id="1TNXcegQDxe" role="37vLTx">
<node concept="2OqwBi" id="1TNXcegQDxf" role="2Oq$k0">
<node concept="2OqwBi" id="1TNXcegQDxg" role="2Oq$k0">
<node concept="liA8E" id="1TNXcegQDxp" role="2OqNvi">
<ref role="37wK5l" node="1TNXceg$vUg" resolve="getNodeMapper" />
<node concept="2OqwBi" id="6fyeJ0bjKFc" role="33vP2m">
<node concept="2OqwBi" id="6fyeJ0bjKFd" role="2Oq$k0">
<node concept="liA8E" id="6fyeJ0bjKFe" role="2OqNvi">
<ref role="37wK5l" node="1TNXceg$vUg" resolve="getNodeMapper" />
</node>
<node concept="37vLTw" id="6fyeJ0bjKFf" role="2Oq$k0">
<ref role="3cqZAo" node="5t$QzkSNPKM" resolve="options" />
</node>
</node>
<node concept="liA8E" id="6fyeJ0bjKFg" role="2OqNvi">
<ref role="37wK5l" node="1TNXcegzljC" resolve="getMappedNodeOrGivenNode" />
<node concept="2OqwBi" id="6fyeJ0bjKFh" role="37wK5m">
<node concept="37vLTw" id="6fyeJ0bjKFi" role="2Oq$k0">
<ref role="3cqZAo" node="2JfTTG8lxUM" resolve="target" />
</node>
<node concept="37vLTw" id="1TNXcegRmDB" role="2Oq$k0">
<ref role="3cqZAo" node="5t$QzkSNPKM" resolve="options" />
<node concept="liA8E" id="6fyeJ0bjKFj" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
<node concept="2OqwBi" id="6fyeJ0bjKFk" role="37wK5m">
<node concept="37vLTw" id="6fyeJ0bjKFl" role="2Oq$k0">
<ref role="3cqZAo" node="2jSY3BO8rVn" resolve="project" />
</node>
<node concept="liA8E" id="6fyeJ0bjKFm" role="2OqNvi">
<ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
</node>
<node concept="liA8E" id="1TNXcegQDxq" role="2OqNvi">
<ref role="37wK5l" node="1TNXcegzljC" resolve="getMappedNodeOrGivenNode" />
<node concept="2OqwBi" id="1TNXcegQDxr" role="37wK5m">
<node concept="37vLTw" id="1TNXcegQDxs" role="2Oq$k0">
<ref role="3cqZAo" node="2JfTTG8lxUM" resolve="target" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="6fyeJ0bn$Fb" role="3cqZAp">
<node concept="3clFbS" id="6fyeJ0bn$Fd" role="3clFbx">
<node concept="3clFbF" id="1TNXcegQhRB" role="3cqZAp">
<node concept="37vLTI" id="1TNXcegQv0q" role="3clFbG">
<node concept="37vLTw" id="1TNXcegQhRA" role="37vLTJ">
<ref role="3cqZAo" node="2JfTTG8lxUM" resolve="target" />
</node>
<node concept="1eOMI4" id="6fyeJ0bn3Fj" role="37vLTx">
<node concept="2OqwBi" id="1TNXcegQDxe" role="1eOMHV">
<node concept="37vLTw" id="6fyeJ0bjKFn" role="2Oq$k0">
<ref role="3cqZAo" node="6fyeJ0bjKFb" resolve="mappedNodeOrGivenNode" />
</node>
<node concept="liA8E" id="1TNXcegQDxt" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
<node concept="2OqwBi" id="1TNXcegQDxu" role="37wK5m">
<node concept="37vLTw" id="1TNXcegQDxv" role="2Oq$k0">
<ref role="3cqZAo" node="2jSY3BO8rVn" resolve="project" />
</node>
<node concept="liA8E" id="1TNXcegQDxw" role="2OqNvi">
<ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
<node concept="liA8E" id="1TNXcegQDxx" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
</node>
<node concept="liA8E" id="1TNXcegQDxx" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="3y3z36" id="6fyeJ0bnPd1" role="3clFbw">
<node concept="10Nm6u" id="6fyeJ0bnXIc" role="3uHU7w" />
<node concept="37vLTw" id="6fyeJ0bnFw4" role="3uHU7B">
<ref role="3cqZAo" node="6fyeJ0bjKFb" resolve="mappedNodeOrGivenNode" />
</node>
</node>
<node concept="9aQIb" id="6fyeJ0borBf" role="9aQIa">
<node concept="3clFbS" id="6fyeJ0borBg" role="9aQI4">
<node concept="3clFbF" id="6fyeJ0boF5S" role="3cqZAp">
<node concept="37vLTI" id="6fyeJ0bp0ux" role="3clFbG">
<node concept="10Nm6u" id="6fyeJ0bp8i_" role="37vLTx" />
<node concept="37vLTw" id="6fyeJ0boF5R" role="37vLTJ">
<ref role="3cqZAo" node="2JfTTG8lxUM" resolve="target" />
</node>
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -6923,7 +6958,7 @@
</node>
<node concept="3clFbF" id="2JfTTG8lxUT" role="3cqZAp">
<node concept="1rXfSq" id="2JfTTG8lxUU" role="3clFbG">
<ref role="37wK5l" node="l9iXyRdj8c" resolve="selectFirstLeafCell" />
<ref role="37wK5l" node="6fyeJ0brdBQ" resolve="selectFirstLeafCell" />
<node concept="37vLTw" id="2JfTTG8lxUV" role="37wK5m">
<ref role="3cqZAo" node="2jSY3BO8rVn" resolve="project" />
</node>
Expand Down Expand Up @@ -7934,11 +7969,8 @@
</node>
</node>
<node concept="2tJIrI" id="$lfQMocIya" role="jymVt" />
<node concept="2YIFZL" id="l9iXyRdj8c" role="jymVt">
<node concept="3clFb_" id="6fyeJ0brdBQ" role="jymVt">
<property role="TrG5h" value="selectFirstLeafCell" />
<property role="od$2w" value="false" />
<property role="DiZV1" value="false" />
<property role="2aFKle" value="false" />
<node concept="3clFbS" id="l9iXyRdj8f" role="3clF47">
<node concept="1QHqEO" id="l9iXyRe0OY" role="3cqZAp">
<node concept="1QHqEC" id="l9iXyRe0P0" role="1QHqEI">
Expand Down Expand Up @@ -8056,8 +8088,6 @@
</node>
</node>
</node>
<node concept="3Tmbuc" id="3EF07Bwwcm5" role="1B3o_S" />
<node concept="3cqZAl" id="l9iXyRdiz5" role="3clF45" />
<node concept="37vLTG" id="l9iXyRdou9" role="3clF46">
<property role="TrG5h" value="project" />
<node concept="3uibUv" id="l9iXyRdou8" role="1tU5fm">
Expand All @@ -8070,6 +8100,8 @@
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="3cqZAl" id="l9iXyRdiz5" role="3clF45" />
<node concept="3Tmbuc" id="3EF07Bwwcm5" role="1B3o_S" />
</node>
<node concept="3Tm1VV" id="2jSY3BO827F" role="1B3o_S" />
<node concept="3uibUv" id="4yQfyMjqdhB" role="1zkMxy">
Expand Down

0 comments on commit e09bdbf

Please sign in to comment.