0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eclipse plugin: Don't suggest any completions if the model is null

Browse source
This commit is contained in:
Timotei Dolean 2012-03-02 22:29:35 +00:00
parent 94018ebec9
commit bb8748ceb3
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java
View file

@ -128,7 +128,9 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
{
super.completeWMLKey_Name( model, assignment, context, acceptor );
addKeyNameProposals( model, context, acceptor );
if( model != null ) {
addKeyNameProposals( model, context, acceptor );
}
}
@Override
@ -137,7 +139,9 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
{
super.complete_WMLKeyValue( model, ruleCall, context, acceptor );
addKeyValueProposals( model, context, acceptor );
if( model != null ) {
addKeyValueProposals( model, context, acceptor );
}
}
@Override
@ -146,7 +150,9 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
{
super.complete_WMLTag( model, ruleCall, context, acceptor );
addTagProposals( model, true, context, acceptor );
if( model != null ) {
addTagProposals( model, true, context, acceptor );
}
}
@Override
@ -155,7 +161,10 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
{
super.completeWMLTag_Name( model, assignment, context, acceptor );
addTagProposals( model, false, context, acceptor );
if( model != null ) {
addTagProposals( model, false, context, acceptor );
}
}
@Override
@ -165,7 +174,9 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
{
super.completeWMLMacroCall_Name( model, assignment, context, acceptor );
addMacroCallProposals( model, false, context, acceptor );
if( model != null ) {
addMacroCallProposals( model, false, context, acceptor );
}
}
@Override
@ -174,7 +185,9 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
{
super.complete_WMLMacroCall( model, ruleCall, context, acceptor );
addMacroCallProposals( model, true, context, acceptor );
if( model != null ) {
addMacroCallProposals( model, true, context, acceptor );
}
}
private void addMacroCallProposals( EObject model, boolean ruleProposal,