Merge branch '__rultor'

yegor256 · Feb 1, 2016 · c0dc6bb · c0dc6bb
2 parents 5159e1b + d3babd1
commit c0dc6bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/qulice-checkstyle/src/main/java/com/qulice/checkstyle/NonStaticMethodCheck.java b/qulice-checkstyle/src/main/java/com/qulice/checkstyle/NonStaticMethodCheck.java
@@ -103,7 +103,8 @@ private void checkClassMethod(final DetailAST method) {
         }
         if (!AnnotationUtility.containsAnnotation(method, "Override")
             && !isInAbstractOrNativeMethod(method)
-            && !method.branchContains(TokenTypes.LITERAL_THIS)) {
+            && !method.branchContains(TokenTypes.LITERAL_THIS)
+            && !method.branchContains(TokenTypes.LITERAL_THROW)) {
             final int line = method.getLineNo();
             this.log(
                 line,

diff --git a/...style/src/test/resources/com/qulice/checkstyle/ChecksTest/NonStaticMethodCheck/Valid.java b/...style/src/test/resources/com/qulice/checkstyle/ChecksTest/NonStaticMethodCheck/Valid.java
@@ -34,4 +34,9 @@ public void someOverrideMethod() {
 
     // this method is not static, but it is native
     public native void someNativeMethod();
+
+    public void someUnimplementedMethod() {
+        // this method is not yet implemented
+        throw new UnsupportedOperationException();
+    }
 }