use queryID if specified to identify display settings

SVN: 15529

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

@@ -96,7 +96,7 @@ public class QueryViewer extends ContentPanel implements IDatabaseModificationOb
         }
         ReportGeneratedCallback callback =
                 new ReportGeneratedCallback(viewContext.getCommonViewContext(),
-                        createReportInformationProvider(sqlQueryOrNull),
+                        createReportInformationProvider(queryIdOrNull, sqlQueryOrNull),
                         createDisplayQueryResultsAction());
         if (queryIdOrNull != null)
         {
@@ -119,7 +119,8 @@ public class QueryViewer extends ContentPanel implements IDatabaseModificationOb
         queryProvider.update(observedModifications);
     }
 
-    private IReportInformationProvider createReportInformationProvider(final String sqlQuery)
+    private IReportInformationProvider createReportInformationProvider(final Long queryIdOrNull,
+            final String sqlQuery)
     {
         return new IReportInformationProvider()
             {
@@ -131,6 +132,10 @@ public class QueryViewer extends ContentPanel implements IDatabaseModificationOb
 
                 public String getKey()
                 {
+                    if (queryIdOrNull != null)
+                    {
+                        return Long.toString(queryIdOrNull);
+                    }
                     return Integer.toString(sqlQuery.hashCode());
                 }