From 0f40312edcaf335fecb237bc4dfda7975e2a073b Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Fri, 23 Aug 2013 17:08:44 +0400
Subject: [PATCH] Change JqlQuery methods, JqlTerminalClause should extend
 JqlClause

---
 .../intellij/tasks/jira/jql/psi/JqlQuery.java    |  6 +++---
 .../tasks/jira/jql/psi/JqlTerminalClause.java    |  2 +-
 .../tasks/jira/jql/psi/impl/JqlQueryImpl.java    | 16 +++++-----------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/jql/psi/JqlQuery.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/jql/psi/JqlQuery.java
index b832b9d684c3..79bb3bfee8f8 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/jql/psi/JqlQuery.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/jql/psi/JqlQuery.java
@@ -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();
 }
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/jql/psi/JqlTerminalClause.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/jql/psi/JqlTerminalClause.java
index d16a1064e404..f44016189fb1 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/jql/psi/JqlTerminalClause.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/jql/psi/JqlTerminalClause.java
@@ -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),
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/jql/psi/impl/JqlQueryImpl.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/jql/psi/impl/JqlQueryImpl.java
index c9ed11a745f1..0565800e8e1a 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/jql/psi/impl/JqlQueryImpl.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/jql/psi/impl/JqlQueryImpl.java
@@ -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);
   }
 }