[LMS-1361] added auto refresh functionality to query selector

SVN: 14865

openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/AbstractCustomQueryToolbar.java

@@ -22,7 +22,6 @@ import com.extjs.gxt.ui.client.widget.button.Button;
 import com.extjs.gxt.ui.client.widget.toolbar.ToolBar;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.IDatabaseModificationObserver;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
 import ch.systemsx.cisd.openbis.plugin.query.client.web.client.IQueryClientServiceAsync;
 import ch.systemsx.cisd.openbis.plugin.query.client.web.client.application.Dict;
@@ -32,8 +31,7 @@ import ch.systemsx.cisd.openbis.plugin.query.client.web.client.application.Dict;
  * 
  * @author Piotr Buczek
  */
-public abstract class AbstractCustomQueryToolbar extends ToolBar implements IQueryProvider,
-        IDatabaseModificationObserver
+public abstract class AbstractCustomQueryToolbar extends ToolBar implements IQueryProvider
 {
     private IDelegatedAction refreshViewerAction;
 

openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/IQueryProvider.java

@@ -16,12 +16,13 @@
 
 package ch.systemsx.cisd.openbis.plugin.query.client.web.client.application.module;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.IDatabaseModificationObserver;
 import ch.systemsx.cisd.openbis.plugin.query.shared.basic.dto.QueryParameterBindings;
 
 /**
  * @author Piotr Buczek
  */
-public interface IQueryProvider
+public interface IQueryProvider extends IDatabaseModificationObserver
 {
     String tryGetSQLQuery();
 

openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModuleDatabaseMenuItem.java

@@ -60,8 +60,8 @@ public class QueryModuleDatabaseMenuItem extends MenuItem
             public DatabaseModificationAwareComponent createComponent(
                     IViewContext<IQueryClientServiceAsync> viewContext)
             {
-                return CustomQueryViewer
-                        .create(viewContext, new RunCustomQueryToolbar(viewContext));
+                return QueryViewer.create(viewContext, new RunCustomQueryToolbar(
+                        viewContext));
             }
         },
         RUN_CANNED_QUERY("Run Predefined Query")
@@ -69,8 +69,8 @@ public class QueryModuleDatabaseMenuItem extends MenuItem
             public DatabaseModificationAwareComponent createComponent(
                     IViewContext<IQueryClientServiceAsync> viewContext)
             {
-                return CustomQueryViewer
-                        .create(viewContext, new RunCannedQueryToolbar(viewContext));
+                return QueryViewer.create(viewContext, new RunCannedQueryToolbar(
+                        viewContext));
             }
         },
         QUERY_BROWSER("Browsing and Editing of SQL Queries")

openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/CustomQueryViewer.java → openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java

@@ -39,13 +39,13 @@ import ch.systemsx.cisd.openbis.plugin.query.shared.basic.dto.QueryParameterBind
 /**
  * @author Piotr Buczek
  */
-public class CustomQueryViewer extends ContentPanel implements IDatabaseModificationObserver
+public class QueryViewer extends ContentPanel implements IDatabaseModificationObserver
 {
 
     public static DatabaseModificationAwareComponent create(
             IViewContext<IQueryClientServiceAsync> viewContext, AbstractCustomQueryToolbar toolbar)
     {
-        final CustomQueryViewer panel = new CustomQueryViewer(viewContext, toolbar);
+        final QueryViewer panel = new QueryViewer(viewContext, toolbar);
         return new DatabaseModificationAwareComponent(panel, panel);
     }
 
@@ -57,7 +57,7 @@ public class CustomQueryViewer extends ContentPanel implements IDatabaseModifica
 
     private IQueryProvider queryProvider;
 
-    private CustomQueryViewer(IViewContext<IQueryClientServiceAsync> viewContext,
+    private QueryViewer(IViewContext<IQueryClientServiceAsync> viewContext,
             AbstractCustomQueryToolbar toolBar)
     {
         this.viewContext = viewContext;
@@ -101,12 +101,12 @@ public class CustomQueryViewer extends ContentPanel implements IDatabaseModifica
 
     public DatabaseModificationKind[] getRelevantModifications()
     {
-        return new DatabaseModificationKind[0];
+        return queryProvider.getRelevantModifications();
     }
 
     public void update(Set<DatabaseModificationKind> observedModifications)
     {
-        return; // nothing to do
+        queryProvider.update(observedModifications);
     }
 
     private IReportInformationProvider createReportInformationProvider(final String sqlQuery)