Change JqlQuery methods, JqlTerminalClause should extend JqlClause

This commit is contained in:
Mikhail Golubev
2013-08-23 17:08:44 +04:00
parent c335f2be57
commit 0f40312edc
3 changed files with 9 additions and 15 deletions
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.Nullable;
public interface JqlQuery extends JqlElement {
@Nullable
JqlClause getClause();
boolean isOrdered();
@NotNull
JqlSortKey[] getOrderKeys();
@Nullable
JqlOrderBy getOrderBy();
}
@@ -10,7 +10,7 @@ import java.util.IdentityHashMap;
/**
* @author Mikhail Golubev
*/
public interface JqlTerminalClause extends JqlElement {
public interface JqlTerminalClause extends JqlClause {
enum Type {
EQ(false),
NE(false),
@@ -1,11 +1,9 @@
package com.intellij.tasks.jira.jql.psi.impl;
import com.intellij.lang.ASTNode;
import com.intellij.tasks.jira.jql.psi.JqlClause;
import com.intellij.tasks.jira.jql.psi.JqlElementVisitor;
import com.intellij.tasks.jira.jql.psi.JqlSortKey;
import com.intellij.tasks.jira.jql.psi.JqlQuery;
import com.intellij.tasks.jira.jql.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @author Mikhail Golubev
@@ -25,13 +23,9 @@ public class JqlQueryImpl extends JqlElementImpl implements JqlQuery {
return findChildByClass(JqlClause.class);
}
@Nullable
@Override
public boolean isOrdered() {
return getOrderKeys().length != 0;
}
@Override
public JqlSortKey[] getOrderKeys() {
return findChildrenByClass(JqlSortKey.class);
public JqlOrderBy getOrderBy() {
return findChildByClass(JqlOrderBy.class);
}
}