SE-124 phosphonetx: make the uniprotId a link (instead of description which...

SE-124 phosphonetx: make the uniprotId a link (instead of description which can be empty) in proteins-in-experiment browser

SVN: 12076

rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinByExperimentBrowserGrid.java

@@ -75,7 +75,7 @@ class ProteinByExperimentBrowserGrid extends AbstractSimpleBrowserGrid<ProteinIn
         toolbar = new ProteinByExperimentBrowerToolBar(viewContext);
         toolbar.setBrowserGrid(this);
         setDisplayTypeIDGenerator(PhosphoNetXDisplayTypeIDGenerator.PROTEIN_BY_EXPERIMENT_BROWSER_GRID);
-        registerLinkClickListenerFor(ProteinColDefKind.DESCRIPTION.id(),
+        registerLinkClickListenerFor(ProteinColDefKind.UNIPROT_ID.id(),
                 new ICellListener<ProteinInfo>()
                     {
                         public void handle(ProteinInfo rowItem)
@@ -104,7 +104,7 @@ class ProteinByExperimentBrowserGrid extends AbstractSimpleBrowserGrid<ProteinIn
     protected ColumnDefsAndConfigs<ProteinInfo> createColumnsDefinition()
     {
         ColumnDefsAndConfigs<ProteinInfo> definitions = super.createColumnsDefinition();
-        definitions.setGridCellRendererFor(ProteinColDefKind.DESCRIPTION.id(), LinkRenderer
+        definitions.setGridCellRendererFor(ProteinColDefKind.UNIPROT_ID.id(), LinkRenderer
                 .createLinkRenderer());
         return definitions;
     }

rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinViewer.java

@@ -86,7 +86,7 @@ public class ProteinViewer extends
                             new ProteinViewer(viewContext, experimentOrNull, proteinInfo.getId());
                     DatabaseModificationAwareComponent c =
                             new DatabaseModificationAwareComponent(viewer, viewer);
-                    String description = StringUtils.abbreviate(proteinInfo.getDescription(), 30);
+                    String description = getAbbreviatedDescription(proteinInfo);
                     String identifier =
                             experimentOrNull == null ? "?" : experimentOrNull.getIdentifier();
                     return DefaultTabItem.create(viewContext.getMessage(
@@ -96,6 +96,16 @@ public class ProteinViewer extends
             };
     }
 
+    private static String getAbbreviatedDescription(final ProteinInfo proteinInfo)
+    {
+        String info = proteinInfo.getDescription();
+        if (info == null)
+        {
+            info = proteinInfo.getUniprotID();
+        }
+        return StringUtils.abbreviate(info, 30);
+    }
+
     static String createWidgetID(TechId proteinReferenceID)
     {
         return ID_PREFIX + proteinReferenceID.getId();