From e5379c7c15b608e5fae3c2f930f2905bb8d62edd Mon Sep 17 00:00:00 2001
From: Matt Nash <Matt_Nash@raytheon.com>
Date: Fri, 11 Jan 2013 10:48:06 -0600
Subject: [PATCH] Issue #1471 fix product browser issues
Change-Id: Ic37ef8f288a4949d13db75b27e7aebb03c8e3062
Former-commit-id: 0a8448cfeddb23228eb6b08f2ddea444c0a015ce [formerly 90fa08596e4d1265fb6f826748dbc87c9304f7e1] [formerly 0a8448cfeddb23228eb6b08f2ddea444c0a015ce [formerly 90fa08596e4d1265fb6f826748dbc87c9304f7e1] [formerly 6bfbf6b0e37a14e359406c73b5fe3820935eb397 [formerly 87ca33679bc3b6ff5fbfffd1f95398b255de9137]]]
Former-commit-id: 6bfbf6b0e37a14e359406c73b5fe3820935eb397
Former-commit-id: 1ab332b654a6446e8bbdebf6d15c96f4e469a402 [formerly addac12b845769eaf342a42f9464883cbbef2448]
Former-commit-id: e85d6610e4ce5d1a7801adee33c11c61f391e424
---
.../uf/viz/productbrowser/ProductBrowserView.java | 15 ++++++++++-----
.../grid/GridProductBrowserDataDefinition.java | 3 +--
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/cave/com.raytheon.uf.viz.productbrowser/src/com/raytheon/uf/viz/productbrowser/ProductBrowserView.java b/cave/com.raytheon.uf.viz.productbrowser/src/com/raytheon/uf/viz/productbrowser/ProductBrowserView.java
index e8e585102f..8651e66f30 100644
--- a/cave/com.raytheon.uf.viz.productbrowser/src/com/raytheon/uf/viz/productbrowser/ProductBrowserView.java
+++ b/cave/com.raytheon.uf.viz.productbrowser/src/com/raytheon/uf/viz/productbrowser/ProductBrowserView.java
@@ -752,13 +752,18 @@ public class ProductBrowserView extends ViewPart {
AbstractProductBrowserDataDefinition<?> prod = (AbstractProductBrowserDataDefinition<?>) ti
.getData("class");
String[] info = getProductURI(ti, false);
- for (int i = 0; i < info.length; i++) {
- if (i != 0) {
- stringBuilder.append("\n");
- }
+ if (prod instanceof AbstractRequestableProductBrowserDataDefinition<?>) {
+ AbstractRequestableProductBrowserDataDefinition<?> aProd = (AbstractRequestableProductBrowserDataDefinition<?>) prod;
+ stringBuilder.append(aProd.PLUGIN_NAME + " = "
+ + aProd.productName);
+ } else {
+ stringBuilder.append(prod.displayName);
+ }
+ for (int i = 1; i < info.length; i++) {
+ stringBuilder.append("\n");
if (prod instanceof AbstractRequestableProductBrowserDataDefinition<?>) {
stringBuilder
- .append(((AbstractRequestableProductBrowserDataDefinition<?>) prod).order[i]
+ .append(((AbstractRequestableProductBrowserDataDefinition<?>) prod).order[i - 1]
+ " = " + info[i]);
} else {
stringBuilder.append(info[i]);
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
index 66690ebd1f..16a87185fc 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
@@ -266,8 +266,7 @@ public class GridProductBrowserDataDefinition extends
parameters[i]));
} else {
labels.add(new ProductBrowserLabel(info.getTitle()
- + " (" + " (" + parameters[i] + ")",
- parameters[i]));
+ + " (" + parameters[i] + ")", parameters[i]));
}
}
Collections.sort(labels);