From 792dd69a3bd71405460905895e07e0f76dcba86b Mon Sep 17 00:00:00 2001 From: Ben Motz Date: Thu, 8 Oct 2015 09:34:14 +0100 Subject: [PATCH] Fix files which had a mix of tabs and spaces Change-Id: I5dd646847a2161b574d61bdb4c32c3811cf38b30 --- .../common/middleware/AuthException.java | 12 ++-- .../common/model/alarm/AlarmExpression.g4 | 58 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthException.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthException.java index 4d1402d5..51200845 100644 --- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthException.java +++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthException.java @@ -24,10 +24,10 @@ public class AuthException extends RuntimeException { private static final long serialVersionUID = 5860956829821067827L; public AuthException(String msg) { - super(msg); - } - - public AuthException(String msg, Exception e) { - super(msg, e); - } + super(msg); + } + + public AuthException(String msg, Exception e) { + super(msg, e); + } } diff --git a/java/monasca-common-model/src/main/resources/monasca/common/model/alarm/AlarmExpression.g4 b/java/monasca-common-model/src/main/resources/monasca/common/model/alarm/AlarmExpression.g4 index 82c78934..9f382e7b 100644 --- a/java/monasca-common-model/src/main/resources/monasca/common/model/alarm/AlarmExpression.g4 +++ b/java/monasca-common-model/src/main/resources/monasca/common/model/alarm/AlarmExpression.g4 @@ -112,7 +112,7 @@ keyword | SUM | CNT | AVG - ; + ; period : INTEGER @@ -134,52 +134,52 @@ txt | STRING ; LT - : [lL][tT] - ; + : [lL][tT] + ; LT_S - : '<' - ; + : '<' + ; LTE - : [lL][tT][eE] - ; + : [lL][tT][eE] + ; LTE_S - : '<=' - ; + : '<=' + ; GT - : [gG][tT] - ; + : [gG][tT] + ; GT_S - : '>' - ; + : '>' + ; GTE - : [gG][tT][eE] - ; - + : [gG][tT][eE] + ; + GTE_S - : '>=' - ; - + : '>=' + ; + AND - : [aA][nN][dD] - ; - + : [aA][nN][dD] + ; + AND_S - : '&&' - ; - + : '&&' + ; + OR - : [oO][rR] - ; + : [oO][rR] + ; OR_S - : '||' - ; + : '||' + ; MIN : [mM][iI][nN]