Merge pull request #2321 from ControlSystemStudio/CSSTUDIO-1720

Save&restore tree view improvement

Author: shroffk

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/BrowserTreeCell.java

@@ -58,10 +58,10 @@ public class BrowserTreeCell extends TreeCell<Node> {
     private javafx.scene.Node saveSetBox;
     private javafx.scene.Node snapshotBox;
 
-    private ContextMenu folderContextMenu;
-    private ContextMenu saveSetContextMenu;
-    private ContextMenu snapshotContextMenu;
-    private ContextMenu rootFolderContextMenu;
+    private final ContextMenu folderContextMenu;
+    private final ContextMenu saveSetContextMenu;
+    private final ContextMenu snapshotContextMenu;
+    private final ContextMenu rootFolderContextMenu;
 
     private static final Border BORDER = new Border(new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID,
             new CornerRadii(5.0), BorderStroke.THIN));
@@ -155,12 +155,11 @@ public void updateItem(Node node, boolean empty) {
             setContextMenu(null);
             return;
         }
-
+        setGraphic(folderBox);
         switch (node.getNodeType()) {
             case SNAPSHOT:
                 ((Label) snapshotBox.lookup("#primaryLabel"))
                         .setText(node.getName());
-                ((Label) snapshotBox.lookup("#secondaryLabel")).setText(node.getCreated() + " (" + node.getUserName() + ")");
                 snapshotBox.lookup("#tagIcon").setVisible(node.getTags() != null && !node.getTags().isEmpty());
                 setGraphic(snapshotBox);
                 if (node.getProperty("golden") != null && Boolean.valueOf(node.getProperty("golden"))) {
@@ -170,9 +169,12 @@ public void updateItem(Node node, boolean empty) {
                 }
                 setContextMenu(snapshotContextMenu);
                 String comment = node.getProperty("comment");
+                StringBuffer stringBuffer = new StringBuffer();
                 if (comment != null && !comment.isEmpty()) {
-                    setTooltip(new Tooltip(comment));
+                    stringBuffer.append(comment).append(System.lineSeparator());
                 }
+                stringBuffer.append(node.getCreated()).append(" (").append(node.getUserName()).append(")");
+                setTooltip(new Tooltip(stringBuffer.toString()));
                 setEditable(false);
                 break;
             case CONFIGURATION:

app/save-and-restore/app/src/main/resources/icons/save-and-restore/saveset.png

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.control.TextField?>
 
 <FlowPane xmlns="http://javafx.com/javafx/8.0.999-ea" xmlns:fx="http://javafx.com/fxml/1">
 
@@ -28,49 +25,33 @@
 				<image>
 					<Image url="/icons/save-and-restore/saveset.png" />
 				</image>
-            <HBox.margin>
-               <Insets top="-1.0" />
-            </HBox.margin>
+
 			</ImageView>
 			<Label fx:id="savesetLabel" text="Label">
-            <HBox.margin>
-               <Insets />
-            </HBox.margin></Label>
+            </Label>
 		</children>
 	</HBox>
 
-	<VBox fx:id="snapshot">
+
+	<HBox fx:id="snapshot">
 		<children>
-			<HBox>
-				<ImageView fx:id="snapshotIcon" pickOnBounds="true" preserveRatio="true">
+		<ImageView fx:id="snapshotIcon" pickOnBounds="true" preserveRatio="true">
+			<image>
+				<Image url="/icons/save-and-restore/snapshot.png" />
+			</image>
+
+		</ImageView>
+
+			<HBox alignment="CENTER_LEFT" spacing="3">
+				<children>
+				<Label fx:id="primaryLabel" text="Label" />
+				<ImageView fx:id="tagIcon" visible="false" fitHeight="13" pickOnBounds="true" preserveRatio="true">
 					<image>
-						<Image url="/icons/save-and-restore/snapshot.png" />
+						<Image url="/icons/save-and-restore/snapshot-tags.png" />
 					</image>
-               <HBox.margin>
-                  <Insets top="3.0" />
-               </HBox.margin>
-				</ImageView>
-				<VBox fx:id="snapshotNodeName">
-					<HBox alignment="CENTER_LEFT" spacing="3">
-						<Label fx:id="primaryLabel" text="Label" />
-                        <ImageView fx:id="tagIcon" visible="false" fitHeight="13" pickOnBounds="true" preserveRatio="true">
-							<image>
-								<Image url="/icons/save-and-restore/snapshot-tags.png" />
-							</image>
-						</ImageView>
-					</HBox>
-					<Label fx:id="secondaryLabel" style="-fx-font-size: 8pt;" text="Label"/>
-					<VBox.margin>
-						<Insets left="2.0" />
-					</VBox.margin>
-               <HBox.margin>
-                  <Insets left="2.0" />
-               </HBox.margin>
-
-				</VBox>
+				</ImageView></children>
 			</HBox>
 		</children>
-	</VBox>
-
+	</HBox>
 
 </FlowPane>