upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-19 10:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

eclipse plugin: add macro parameters

Browse Source
This commit is contained in:
Timotei Dolean 2010-08-06 21:43:07 +00:00
parent 6149d9814d
commit f3bb495761
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
utils/java/eclipse_plugin/src/wesnoth_eclipse_plugin/utils/PreprocessorUtils.java
View File

@ -104,14 +104,19 @@ public class PreprocessorUtils
arguments.add(macrosFile); arguments.add(macrosFile);
} }
//TODO: remove me when trimming is done
if (defines == null)
defines = new ArrayList<String>();
defines.add("NO_TERRAIN_GFX");
if (defines != null && !defines.isEmpty()) if (defines != null && !defines.isEmpty())
{ {
String argument = "-p="; String argument = "-p=";
for(int i=0;i<defines.size()-1;i++) for(int i=0;i< defines.size() - 1;i++)
{ {
argument += (defines.get(i) + ","); argument += (defines.get(i) + ",");
} }
argument += defines.get(defines.size()-1); argument += defines.get(defines.size()-1);
arguments.add(argument); arguments.add(argument);
} }
else else

13
utils/java/org.wesnoth.wml.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java
View File

@ -111,9 +111,16 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
for(Define define : ProjectUtils.getCacheForProject(file.getProject()).getDefines()) for(Define define : ProjectUtils.getCacheForProject(file.getProject()).getDefines())
{ {
acceptor.accept(createCompletionProposal( StringBuilder proposal = new StringBuilder(10);
(ruleProposal == true ? "{" : "") + define.getName() + "}", if (ruleProposal == true)
define.getName(), proposal.append("{");
proposal.append(define.getName());
for(String arg : define.getArguments())
proposal.append(" " + arg);
proposal.append("}");
acceptor.accept(createCompletionProposal(proposal.toString(), define.getName(),
WMLLabelProvider.getImageByName("macrocall.png"), context)); WMLLabelProvider.getImageByName("macrocall.png"), context));
} }
} }