Changed placeholder text for imager used.

src/main/java/com/scitequest/martin/view/ExportGui.java

@@ -56,34 +56,34 @@
 public final class ExportGui extends JDialog {
 
     /** The logger for this class. */
     private static final Logger log = Logger.getLogger("com.scitequest.martin.view.ExportGui");
 
     private final Controlable control;
     private final Settings settings;
 
     private final ZonedDateTime datetime;
     private final Parameters parameters;
     private final Data data;
     private final DataStatistics dataStatistics;
 
     private final JComboBox<String> projectDropdown;
 
     private final JTextField sampleId = new JTextField();
     private final JTextField name = new JTextField();
     private final TimestampInput timestampInput;
     private final TagSelection sampleTags = TagSelection.empty();
     private final IncubationInput incubationInput = new IncubationInput();
     private final JTextField imager = new JTextField();
     private final SpinnerNumberModel exposureTime;
     private final SpinnerNumberModel pixelBinning;
 
     public ExportGui(Frame owner, Controlable control, Settings settings,
             ZonedDateTime datetime, Optional<LocalDateTime> assayDatetime,
             Parameters parameters,
             Data data, DataStatistics dataStatistics) {
         super(owner, "Enter Export Metadata", false);
 
         this.control = control;
         this.settings = settings;
         this.datetime = datetime;
         this.parameters = parameters;
@@ -129,7 +129,7 @@
         // ---- projectDropdown ----
         projectDropdown = new JComboBox<>();
         updateProjectDropdownList();
         projectDropdown.setSelectedIndex(settings.getProjectSettings().getLastUsedProjectIndex() + 1);
         projectDropdown.addActionListener(e -> loadProject(projectDropdown.getSelectedIndex()));
 
         // ---- projectManagerButton ----
@@ -141,9 +141,9 @@
         projectManagerButton.addActionListener(e -> openProjectManager());
 
         JPanel projectPanel = new JPanel();
         projectPanel.setBorder(new EmptyBorder(5, 200, 5, 200));
         projectPanel.setBackground(UIManager.getColor("MenuBar.background"));
         projectPanel.setLayout(new GridLayout(1, 0, 5, 0));
         projectPanel.add(projectDropdown);
         projectPanel.add(projectManagerButton);
 
@@ -151,17 +151,17 @@
 
         // ======== mainMetadata ========
         JPanel mainMetadata = new JPanel();
         mainMetadata.setBorder(new EmptyBorder(5, 5, 5, 5));
         mainMetadata.setLayout(new GridBagLayout());
         ((GridBagLayout) mainMetadata.getLayout()).columnWidths = new int[] {
                 205, 200, 0 };
         ((GridBagLayout) mainMetadata.getLayout()).rowHeights = new int[] {
                 0, 0, 0, 0, 0, 0, 0, 0, 95, 0, 0, 0, 0, 0, 0, 0, 0 };
         ((GridBagLayout) mainMetadata.getLayout()).columnWeights = new double[] {
                 1.0, 1.0, 1.0E-4 };
         ((GridBagLayout) mainMetadata.getLayout()).rowWeights = new double[] {
                 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
                 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0E-4 };
 
         // ---- sampleHeader ----
         JLabel sampleHeader = new JLabel();
@@ -169,7 +169,7 @@
         sampleHeader.putClientProperty("FlatLaf.styleClass", "h2");
         mainMetadata.add(sampleHeader, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 10, 0), 0, 0));
 
         // ---- sampleIdLabel ----
         JLabel sampleIdLabel = new JLabel();
@@ -178,14 +178,14 @@
         sampleIdLabel.putClientProperty("FlatLaf.styleClass", "h4");
         mainMetadata.add(sampleIdLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 5), 0, 0));
 
         // ---- sampleId ----
         sampleId.putClientProperty("JTextField.showClearButton", true);
         sampleId.putClientProperty("JTextField.placeholderText", "CS001");
         mainMetadata.add(sampleId, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 5), 0, 0));
 
         // ---- sampleIdDescription ----
         JTextArea sampleIdDescription = new JTextArea(2, 1);
@@ -195,9 +195,9 @@
         sampleIdDescription.setEditable(false);
         sampleIdDescription.setEnabled(false);
         sampleIdDescription.setOpaque(false);
         mainMetadata.add(sampleIdDescription, new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, -5, 5, 0), 0, 0));
 
         // ---- nameLabel ----
         JLabel nameLabel = new JLabel();
@@ -205,14 +205,14 @@
         nameLabel.putClientProperty("FlatLaf.styleClass", "h4");
         mainMetadata.add(nameLabel, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 0), 0, 0));
 
         // ---- name ----
         name.putClientProperty("JTextField.placeholderText", "control sample 1");
         name.putClientProperty("JTextField.showClearButton", true);
         mainMetadata.add(name, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 0), 0, 0));
 
         // ---- nameDescription ----
         JTextArea nameDescription = new JTextArea(2, 1);
@@ -222,23 +222,23 @@
         nameDescription.setEditable(false);
         nameDescription.setEnabled(false);
         nameDescription.setOpaque(false);
         mainMetadata.add(nameDescription, new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, -5, 5, 0), 0, 0));
 
         // ---- assayDateLabel ----
         JLabel assayDateTimeLabel = new JLabel();
         assayDateTimeLabel.setText(Const.bundle.getString("exportGui.assayDateTimeLabel.text"));
         assayDateTimeLabel.putClientProperty("FlatLaf.styleClass", "h4");
         mainMetadata.add(assayDateTimeLabel, new GridBagConstraints(0, 4, 2, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 0), 0, 0));
 
         // ---- assayTimestampInput
         timestampInput = TimestampInput.of(assayDatetime);
         mainMetadata.add(timestampInput, new GridBagConstraints(0, 5, 2, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 0), 0, 0));
 
         // ---- assayDateTimeDescription ----
         JTextArea assayDateDescription = new JTextArea();
@@ -249,46 +249,46 @@
         assayDateDescription.setEditable(false);
         assayDateDescription.setEnabled(false);
         assayDateDescription.setOpaque(false);
         mainMetadata.add(assayDateDescription, new GridBagConstraints(0, 6, 2, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, -5, 5, 0), 0, 0));
 
         // ---- tagsLabel ----
         JLabel tagsLabel = new JLabel();
         tagsLabel.setText(Const.bundle.getString("exportGui.tagsLabel.text"));
         tagsLabel.putClientProperty("FlatLaf.styleClass", "h4");
         mainMetadata.add(tagsLabel, new GridBagConstraints(0, 7, 2, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 0), 0, 0));
 
         // ---- tag selection ----
         mainMetadata.add(sampleTags, new GridBagConstraints(0, 8, 2, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 0), 0, 0));
 
         // ---- imageHeader ----
         JLabel imageHeader = new JLabel();
         imageHeader.setText(Const.bundle.getString("exportGui.imageHeader.text"));
         imageHeader.putClientProperty("FlatLaf.styleClass", "h2");
         mainMetadata.add(imageHeader, new GridBagConstraints(0, 9, 2, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(10, 0, 10, 0), 0, 0));
 
         // ---- imagerLabel ----
         JLabel imagerLabel = new JLabel();
         imagerLabel.setText(Const.bundle.getString("exportGui.imagerLabel.text"));
         imagerLabel.setLabelFor(imager);
         imagerLabel.putClientProperty("FlatLaf.styleClass", "h4");
         mainMetadata.add(imagerLabel, new GridBagConstraints(0, 10, 2, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 0), 0, 0));
 
         // ---- imager ----
-        imager.putClientProperty("JTextField.placeholderText", "Azure 300");
+        imager.putClientProperty("JTextField.placeholderText", "Imager");
         imager.putClientProperty("JTextField.showClearButton", true);
         mainMetadata.add(imager, new GridBagConstraints(0, 11, 2, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 0), 0, 0));
 
         // ---- imagerDescription ----
         JTextArea imagerDescription = new JTextArea();
@@ -298,30 +298,30 @@
         imagerDescription.setEditable(false);
         imagerDescription.setEnabled(false);
         imagerDescription.setOpaque(false);
         mainMetadata.add(imagerDescription, new GridBagConstraints(0, 12, 2, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, -5, 5, 0), 0, 0));
 
         // ---- exposureTimeLabel ----
         JLabel exposureTimeLabel = new JLabel();
         exposureTimeLabel.setText(Const.bundle.getString("exportGui.exposureTimeLabel.text"));
         exposureTimeLabel.putClientProperty("FlatLaf.styleClass", "h4");
         mainMetadata.add(exposureTimeLabel, new GridBagConstraints(0, 13, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 5), 0, 0));
 
         // ---- exposureTime ---
         exposureTime = new SpinnerNumberModel(15, 0, Integer.MAX_VALUE, 10);
         JSpinner exposureTimeSpinner = new JSpinner(exposureTime);
         ((JSpinner.DefaultEditor) exposureTimeSpinner.getEditor())
                 .getTextField()
                 .setColumns(2);
         mainMetadata.add(exposureTimeSpinner, new GridBagConstraints(0, 14, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 5), 0, 0));
 
         // ---- exposureTimeDescription ----
         JTextArea exposureTimeDescription = new JTextArea(3, 1);
         exposureTimeDescription.setText(
                 Const.bundle.getString("exportGui.exposureTimeDescription.text"));
         exposureTimeDescription.setLineWrap(true);
@@ -329,17 +329,17 @@
         exposureTimeDescription.setEditable(false);
         exposureTimeDescription.setEnabled(false);
         exposureTimeDescription.setOpaque(false);
         mainMetadata.add(exposureTimeDescription, new GridBagConstraints(0, 15, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, -5, 5, 0), 0, 0));
 
         // ---- pixelBinningLabel ----
         JLabel pixelBinningLabel = new JLabel();
         pixelBinningLabel.setText(Const.bundle.getString("exportGui.pixelBinningLabel.text"));
         pixelBinningLabel.putClientProperty("FlatLaf.styleClass", "h4");
         mainMetadata.add(pixelBinningLabel, new GridBagConstraints(1, 13, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 0), 0, 0));
 
         // ---- pixelBinning
         pixelBinning = new SpinnerNumberModel(1, 1, Integer.MAX_VALUE, 1);
@@ -347,12 +347,12 @@
         ((JSpinner.DefaultEditor) pixelBinningSpinner.getEditor())
                 .getTextField()
                 .setColumns(2);
         mainMetadata.add(pixelBinningSpinner, new GridBagConstraints(1, 14, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 5, 0), 0, 0));
 
         // ---- pixelBinningDescription ----
         JTextArea pixelBinningDescription = new JTextArea(3, 1);
         pixelBinningDescription.setText(
                 Const.bundle.getString("exportGui.pixelBinningDescription.text"));
         pixelBinningDescription.setLineWrap(true);
@@ -360,20 +360,20 @@
         pixelBinningDescription.setEditable(false);
         pixelBinningDescription.setEnabled(false);
         pixelBinningDescription.setOpaque(false);
         mainMetadata.add(pixelBinningDescription, new GridBagConstraints(1, 15, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, -5, 0, 0), 0, 0));
         add(mainMetadata, BorderLayout.CENTER);
 
         // ======== incubations ========
         JPanel incubationPanel = new JPanel();
         incubationPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
         incubationPanel.setLayout(new GridBagLayout());
         ((GridBagLayout) incubationPanel.getLayout()).columnWidths = new int[] { 0, 0 };
         ((GridBagLayout) incubationPanel.getLayout()).rowHeights = new int[] { 0, 0, 0 };
         ((GridBagLayout) incubationPanel.getLayout()).columnWeights = new double[] { 1.0, 1.0E-4 };
         ((GridBagLayout) incubationPanel.getLayout()).rowWeights = new double[] {
                 0.0, 1.0, 1.0E-4 };
 
         // ---- incubationsHeader ----
         JLabel incubationsHeader = new JLabel();
@@ -381,7 +381,7 @@
         incubationsHeader.putClientProperty("FlatLaf.styleClass", "h2");
         incubationPanel.add(incubationsHeader, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 10, 0), 0, 0));
 
         // ---- incubationInput
         incubationPanel.add(incubationInput, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
@@ -395,9 +395,9 @@
         actionPanel.setLayout(new GridBagLayout());
         ((GridBagLayout) actionPanel.getLayout()).columnWidths = new int[] { 0, 0, 0, 0, 0, 0, 0 };
         ((GridBagLayout) actionPanel.getLayout()).rowHeights = new int[] { 0, 0 };
         ((GridBagLayout) actionPanel.getLayout()).columnWeights = new double[] { 0.0, 0.0, 0.0, 1.0, 0.0, 0.0,
                 1.0E-4 };
         ((GridBagLayout) actionPanel.getLayout()).rowWeights = new double[] { 0.0, 1.0E-4 };
 
         // ---- showResultTableButton ----
         JButton showResultTableButton = new JButton();
@@ -406,7 +406,7 @@
         showResultTableButton.addActionListener(e -> handleShowResultTable());
         actionPanel.add(showResultTableButton, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(5, 5, 5, 0), 0, 0));
 
         // ---- showAnalysisTableButton ----
         JButton showAnalysisTableButton = new JButton();
@@ -415,7 +415,7 @@
         showAnalysisTableButton.addActionListener(e -> handleShowAnalysisTable());
         actionPanel.add(showAnalysisTableButton, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(5, 5, 5, 0), 0, 0));
 
         // ---- showGriddedImageButton ----
         JButton showGriddedImageButton = new JButton();
@@ -424,7 +424,7 @@
         showGriddedImageButton.addActionListener(e -> handleShowGriddedImage());
         actionPanel.add(showGriddedImageButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(5, 5, 5, 5), 0, 0));
 
         // ---- exportButton ----
         JButton exportButton = new JButton();
@@ -433,9 +433,9 @@
         exportButton.setBackground(UIManager.getColor("Actions.Green"));
         exportButton.setForeground(SystemColor.text);
         exportButton.addActionListener(e -> handleExportButtonPressed());
         actionPanel.add(exportButton, new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0,
                 GridBagConstraints.EAST, GridBagConstraints.VERTICAL,
                 new Insets(5, 5, 5, 0), 0, 0));
 
         // ---- cancelButton ----
         JButton cancelButton = new JButton();
@@ -444,13 +444,13 @@
         cancelButton.setBackground(UIManager.getColor("Actions.Red"));
         cancelButton.setForeground(SystemColor.text);
         cancelButton.addActionListener(e -> closeExportGui());
         actionPanel.add(cancelButton, new GridBagConstraints(5, 0, 1, 1, 0.0, 0.0,
                 GridBagConstraints.EAST, GridBagConstraints.VERTICAL,
                 new Insets(5, 5, 5, 5), 0, 0));
         add(actionPanel, BorderLayout.SOUTH);
 
         // Load a dummy incubation for the layouting.
         Quantity dummyQty = Quantity.of(100., Unit.PERCENT);
         incubationInput.setIncubations(List.of(
                 Incubation.of("solution", dummyQty, dummyQty, Duration.ZERO)));
 
@@ -482,7 +482,7 @@
     private void openProjectManager() {
         ProjectGui.open(this, control, settings);
         updateProjectDropdownList();
         projectDropdown.setSelectedIndex(settings.getProjectSettings().getLastUsedProjectIndex() + 1);
         // Maybe unneccessary if actionListener behaves like changeListener
         loadProject(projectDropdown.getSelectedIndex());
     }
@@ -502,7 +502,7 @@
             Patient patient = Patient.of(this.sampleId.getText(), this.name.getText(),
                     this.sampleTags.getSelectedTags());
             // Get the image metadata
             Duration exposureTime = Duration.ofSeconds(this.exposureTime.getNumber().intValue());
             int pixBinning = this.pixelBinning.getNumber().intValue();
             ZonedDateTime created = timestampInput.getDateTime();
             Image image = Image.of(created, this.imager.getText(), pixBinning, exposureTime);
@@ -566,14 +566,14 @@
         table.setVisible(true);
     }
 
     public void loadProject(int projectIndex) {
         ProjectSettings projectSettings = settings.getProjectSettings();
         if (projectIndex == 0) {
             sampleTags.clearTags();
             incubationInput.emptyIncubationInput();
             imager.setText(null);
             pixelBinning.setValue(1);
             exposureTime.setValue(10);
             projectSettings.setLastUsedProjectIndex(-1);
         } else {
             int settingsProjIdx = projectIndex - 1;

src/main/java/com/scitequest/martin/view/ProjectGui.java

@@ -264,7 +264,7 @@
                 new Insets(0, 0, 5, 0), 0, 0));
 
         // ---- imager ----
-        imager.putClientProperty("JTextField.placeholderText", "Azure 300");
+        imager.putClientProperty("JTextField.placeholderText", "Imager");
         imager.putClientProperty("JTextField.showClearButton", true);
         mainMetadata.add(imager, new GridBagConstraints(0, 9, 2, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
@@ -489,16 +489,16 @@
     private Optional<ProjectExt> validateInputs() {
         ProjectExt proj;
         try {
             proj = getProjectFromInputsUnchecked();
         } catch (IllegalArgumentException e) {
             JOptionPane.showMessageDialog(this,
                     Const.bundle.getString("messageDialog.invalidInput.text") + " "
                             + e.getMessage(),
                     Const.bundle.getString("messageDialog.invalidInput.title"),
                     JOptionPane.ERROR_MESSAGE);
             return Optional.empty();
         }
         return Optional.of(proj);
     }
 
     /**
@@ -603,7 +603,7 @@
 
     @Override
     public void handleExport(int index, Path path) {
         log.finer(String.format("Exporting project with index %d as path %s", index, path));
         Optional<ProjectExt> maybeProject = validateInputsInternal();
 
         if (!maybeProject.isEmpty()) {
@@ -613,7 +613,7 @@
 
     @Override
     public void handleImport(Path path) {
         log.finer(String.format("Importing a mask from path", path));
 
         try {
             control.importProject(path);
@@ -625,7 +625,7 @@
             return;
         }
 
         log.info(String.format("Project file '%s' has been imported", path));
     }
 
     @Override
@@ -642,7 +642,7 @@
 
     @Override
     public void addCopyOfElement(int index, String name) {
         log.finer(String.format("Copying project with index %d and new name %s", index, name));
         ProjectExt maskCopy = projectSettings.getProject(index).withName(name);
         projectSettings.addProject(maskCopy);
     }