From d3742eb12d98ec3593a59cb0f75ce4085c69cc6d Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Fri, 19 Feb 2010 10:54:55 +0000
Subject: [PATCH] [LMS-1361] added auto refresh functionality to query selector
SVN: 14865
---
.../application/module/AbstractCustomQueryToolbar.java | 4 +---
.../web/client/application/module/IQueryProvider.java | 3 ++-
.../module/QueryModuleDatabaseMenuItem.java | 8 ++++----
.../{CustomQueryViewer.java => QueryViewer.java} | 10 +++++-----
4 files changed, 12 insertions(+), 13 deletions(-)
rename openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/{CustomQueryViewer.java => QueryViewer.java} (93%)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/AbstractCustomQueryToolbar.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/AbstractCustomQueryToolbar.java
index 2fd11ac9f6b..b7ace57ef96 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/AbstractCustomQueryToolbar.java
+++ b/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;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/IQueryProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/IQueryProvider.java
index 2439411ef69..7d0e17125b8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/IQueryProvider.java
+++ b/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();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModuleDatabaseMenuItem.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModuleDatabaseMenuItem.java
index 81e80fe99e0..5f9bde3968e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModuleDatabaseMenuItem.java
+++ b/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")
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/CustomQueryViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/CustomQueryViewer.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java
index 6929fa9ea35..c23a42729f6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/CustomQueryViewer.java
+++ b/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)
--
GitLab