// Set up the terms used for the template expansion.
HashMap<String,String> terms = new HashMap<String,String>();
- terms.put("RETURNTYPE", component.getReturnType().getDescriptor(language).replaceAll("\\s+", ""));
+ terms.put("RETURNTYPE", component.getReturnType().getDescriptor(language));
terms.put("CLASSNAME", name);
terms.put("METHODNAME", component.getMethodName());
terms.put("METHODPARAMS", getMethodParams(component.getParamTypes(),
// Finally, expand the Makefile template and write it.
File makeFile = new File(directory, "Makefile");
+ if (!makeFile.canRead())
{
String text = Util.expandTemplate(readTemplate(lang + "Makefile"),
terms);
* before the timeout, we will assume it is not backgrounding and
* that everything worked. This works as long as the Vim server is
* able to start within the stall period. */
- long expire = System.currentTimeMillis() + 250;
+ long expire = System.currentTimeMillis() + 1000;
while (System.currentTimeMillis() < expire)
{
Thread.yield();
String[] strings = new String[types.length];
for (int i = 0; i < types.length; ++i)
{
- strings[i] = types[i].getDescriptor(language).replaceAll("\\s+", "");
+ strings[i] = types[i].getDescriptor(language);
}
return strings;
}