Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor Formatting changes #197

Merged
merged 13 commits into from
Jan 5, 2018
Merged

Minor Formatting changes #197

merged 13 commits into from
Jan 5, 2018

Conversation

sdutry
Copy link
Member

@sdutry sdutry commented Jan 3, 2018

  • made some minor formatting changes concerning:
    • mixed tabs and spaces
    • add curly brackets around single line conditional statements
  • added some missing ´@OverRide´ annotations

- add curly brackets around single line conditional statements
- place finally statement on same line as closing catch bracket
- add curly brackets around single line conditional statements
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.01%) to 46.285% when pulling a29051c on sdutry:formatting-changes into 8eb282f on apache:master.

@lukaszlenart
Copy link
Member

Looks good to me but it would be nice if you could increase coverage to satisfy Coveralls :)

@sdutry
Copy link
Member Author

sdutry commented Jan 4, 2018

if you could increase coverage to satisfy Coveralls

I'll look into it.
It's a bit annoying that it counts the lines with only a closing bracket => decreased coverage.

Test that a ConfigurationException is thrown when the
TemplateEngineManager returns null instead of a TemplateEngine
instance.
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.007%) to 46.289% when pulling 0bfdc5e on sdutry:formatting-changes into 8eb282f on apache:master.

@sdutry
Copy link
Member Author

sdutry commented Jan 4, 2018

@lukaszlenart
slowly getting there

Coverage decreased (-0.01%) to 46.285%

to

Coverage decreased (-0.007%) to 46.289%

Verified that:
- default template name gets picked when no specific one is given
- specific template gets precedence over default one
@coveralls
Copy link

coveralls commented Jan 4, 2018

Coverage Status

Coverage increased (+0.005%) to 46.301% when pulling 476697f on sdutry:formatting-changes into 8eb282f on apache:master.

Verified that:
- explicit templateDirectory gets precedence
- attribute templateDir gets picked if no explitit one is given
- defaultTemplateDirectory gets picked if there is no explicit one and
    an attribute templateDid
- "template" is returned as default value
Verified that the value is added to the parameters after they have
been evaluated.
Verified that the value parameter is added as the nameValue parameter.
@coveralls
Copy link

coveralls commented Jan 4, 2018

Coverage Status

Coverage increased (+0.01%) to 46.306% when pulling 2fd2cb5 on sdutry:formatting-changes into 8eb282f on apache:master.

@lukaszlenart
Copy link
Member

💯

@lukaszlenart
Copy link
Member

@sdutry ready to be merged?

@sdutry
Copy link
Member Author

sdutry commented Jan 5, 2018

@lukaszlenart

ready to be merged?

I think so.
Unless you have other changes you want to see done?

Maybe the following piece of comment should be removed?

 /**
  *		  
  * @version $Date$ $Id$
  */		 
 public class UIBeanTest extends StrutsInternalTestCase {

@lukaszlenart
Copy link
Member

Yes, please do, those are some leftovers from Subversion - not in use anymore

@coveralls
Copy link

coveralls commented Jan 5, 2018

Coverage Status

Coverage increased (+0.01%) to 46.306% when pulling 0deea3f on sdutry:formatting-changes into 8eb282f on apache:master.

@lukaszlenart
Copy link
Member

nice, LGTM 👍

@lukaszlenart lukaszlenart merged commit f803ddb into apache:master Jan 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants