Commits

John Paulett committed 9449408

Update a few labels' wording according to Dan and move the scan selection list to above the session summary.

Comments (0)

Files changed (3)

src/main/java/org/nrg/upload/ui/AssignSessionVariablesPage.java

 public final class AssignSessionVariablesPage extends WizardPage implements SessionVariableConsumer {
 	private static final long serialVersionUID = 1L;
 	
-	private static final String STEP_DESCRIPTION = "Assign session variables";
-	private static final String LONG_DESCRIPTION = "Review session information and assign session identifiers";
+	private static final String STEP_DESCRIPTION = "Enter session details";
+	private static final String LONG_DESCRIPTION = "Review session information and enter session details";
 	public static final String PRODUCT_NAME = "*session-variables*";
 	
 	private final Logger logger = Logger.getLogger(AssignSessionVariablesPage.class);

src/main/java/org/nrg/upload/ui/SelectSessionPage.java

 	private static final long serialVersionUID = 1L;
 	
 	public static final String PRODUCT_NAME = "*session*";
-	private static final String STEP_DESCRIPTION = "Select session";
+	private static final String STEP_DESCRIPTION = "Review session";
 	private static final String LONG_DESCRIPTION = "Review session information";
 	
 	public static String getDescription() {

src/main/java/org/nrg/upload/ui/SessionReviewPanel.java

 import java.util.List;
 import java.util.Set;
 
+import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 	public SessionReviewPanel(final Session session) {
 		setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
 		this.session = session;
-		add(new JLabel(session.getFormat() + " session " + session.getID()));
-		add(new JLabel("Accession: " + session.getAccession()));
-		add(new JLabel("Date/time: " + session.getDateTime()));
-		add(new JLabel("Description: " + session.getDescription()));
-		add(buildModalitiesLabel(session));
-		add(new JLabel(describeScans(session)));
-		
+
 		// for now, only allow selection of series from DICOM
 		if (session instanceof Study) {
-			add(buildScansTable((Study) session));
+			add(createScanDetails(session));
 		}
-		
+
+		add(createSessionSummary(session));
+
 		validate();
 		setVisible(true);
 	}
+
+	private static JPanel createScanDetails(final Session session) {
+		final JPanel panel = new JPanel();
+		panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS));
 		
+		panel.add(new JLabel("<html><b>Scan Details</b></html>"));
+		panel.add(buildScansTable((Study) session));
+		panel.add(new JLabel("Note: Unchecked scans will not be uploaded."));
+		
+		panel.setBorder(BorderFactory.createEmptyBorder(0,0,15,0));
+		
+		return panel;
+	}
+
+	private static JPanel createSessionSummary(final Session session) {
+		final JPanel panel = new JPanel();
+		panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS));
+		
+		panel.add(new JLabel("<html><b>Session Summary</b></html>"));
+		panel.add(new JLabel(session.getFormat() + " session " + session.getID()));
+		panel.add(new JLabel("Accession: " + session.getAccession()));
+		panel.add(new JLabel("Date/time: " + session.getDateTime()));
+		panel.add(new JLabel("Description: " + session.getDescription()));
+		panel.add(buildModalitiesLabel(session));
+		panel.add(new JLabel(describeScans(session)));
+		
+		return panel;
+	}
+	
 	private static JLabel buildModalitiesLabel(final Session session) {
 		final Set<String> modalities = session.getModalities();
 		if (1 == modalities.size()) {