Fixed some labels

Author: akramhar

src/main/java/edu/umassmed/omega/commons/trajectoryTool/gui/OmegaTracksToolDialog.java

@@ -41,13 +41,13 @@
 import edu.umassmed.omega.commons.utilities.OmegaIOUtility;
 
 public class OmegaTracksToolDialog extends GenericDialog {
-	
+
 	private static final long serialVersionUID = -4689339679604912836L;
-	
+
 	private static String EXTENSIONS_TXT = "txt";
 	private static String EXTENSIONS_XY = "xy";
 	private static String EXTENSIONS_CSV = "csv";
-	
+
 	private JButton chooseFile_btt, action_btt, close_btt;
 	private JButton addData_btt, addStandardData_btt, moveDataUp_btt,
 			moveDataDown_btt, removeData_btt;
@@ -61,17 +61,17 @@ public class OmegaTracksToolDialog extends GenericDialog {
 	private GenericInsertDialog insertDialog;
 	private GenericPickDialog pickDialog;
 	private JComboBox<String> extension_cmb;
-	
+
 	private String selectedVal;
-	
+
 	private final OmegaIOUtility otio;
-	
+
 	private final boolean isImpExp, isImporter;
-	
+
 	private JPanel fieldsPanel;
-	
-	private GenericStatusPanel statusPanel;
 
+	private GenericStatusPanel statusPanel;
+	
 	public OmegaTracksToolDialog(final RootPaneContainer parentContainer,
 			final boolean isImpExp, final boolean isImporter,
 			final OmegaIOUtility otio) {
@@ -83,22 +83,22 @@ public OmegaTracksToolDialog(final RootPaneContainer parentContainer,
 		this.isImpExp = isImpExp;
 		this.otio = otio;
 		this.selectedVal = null;
-
-		this.adjustWidgets();
 
+		this.adjustWidgets();
+
 		this.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
 		this.revalidate();
 		this.repaint();
 		this.pack();
 	}
-	
+
 	private void adjustWidgets() {
 		if (!this.isImporter) {
 			this.fieldsPanel.setLayout(new GridLayout(9, 1));
 		} else {
 			this.fieldsPanel.setLayout(new GridLayout(8, 1));
 		}
-		
+
 		if (!this.isImporter) {
 			final JPanel extensionPanel = new JPanel();
 			extensionPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
@@ -119,14 +119,14 @@ public void actionPerformed(final ActionEvent e) {
 			extensionPanel.add(this.extension_cmb);
 			this.fieldsPanel.add(extensionPanel, 4);
 		}
-		
+
 		if (this.isImporter) {
 			this.action_btt.setText("Import");
 		} else {
 			this.action_btt.setText("Export");
 		}
 	}
-	
+
 	@Override
 	protected void createAndAddWidgets() {
 		this.insertDialog = new GenericInsertDialog(this.getParentContainer(),
@@ -136,14 +136,14 @@ protected void createAndAddWidgets() {
 		this.fileChooser = new JFileChooser(System.getProperty("user.dir"));
 		this.fileChooser
 				.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
-		
+
 		final JPanel mainPanel = new JPanel();
 		mainPanel.setLayout(new BorderLayout());
-		
+
 		final JPanel fieldsPanelMain = new JPanel();
 		fieldsPanelMain.setLayout(new BorderLayout());
 		this.fieldsPanel = new JPanel();
-		
+
 		final JPanel filePanel = new JPanel();
 		filePanel.setLayout(new FlowLayout(FlowLayout.LEFT));
 		final JLabel folder_lbl = new JLabel("Select folder: ");
@@ -158,7 +158,7 @@ protected void createAndAddWidgets() {
 		this.chooseFile_btt.setPreferredSize(OmegaConstants.BUTTON_SIZE);
 		filePanel.add(this.chooseFile_btt);
 		this.fieldsPanel.add(filePanel);
-		
+
 		final JPanel multipleFilesPanel = new JPanel();
 		multipleFilesPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
 		final JLabel multipleFiles_lbl = new JLabel("Multiple files: ");
@@ -169,7 +169,7 @@ protected void createAndAddWidgets() {
 		this.multipleFiles_ckb = new JCheckBox();
 		multipleFilesPanel.add(this.multipleFiles_ckb);
 		this.fieldsPanel.add(multipleFilesPanel);
-		
+
 		final JPanel fileIdentifierPanel = new JPanel();
 		fileIdentifierPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
 		final JLabel fileIdentifier_lbl = new JLabel("File indentifier: ");
@@ -182,7 +182,7 @@ protected void createAndAddWidgets() {
 				.setPreferredSize(OmegaConstants.LARGE_TEXT_SIZE);
 		fileIdentifierPanel.add(this.fileIdentifier_txt);
 		this.fieldsPanel.add(fileIdentifierPanel);
-		
+
 		final JPanel trackIdentifierPanel = new JPanel();
 		trackIdentifierPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
 		final JLabel trackIdentifier_lbl = new JLabel("Data type indentifier: ");
@@ -195,11 +195,10 @@ protected void createAndAddWidgets() {
 				.setPreferredSize(OmegaConstants.LARGE_TEXT_SIZE);
 		trackIdentifierPanel.add(this.dataIdentifier_txt);
 		this.fieldsPanel.add(trackIdentifierPanel);
-		
+
 		final JPanel particleIdentifierPanel = new JPanel();
 		particleIdentifierPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
-		final JLabel particleIdentifier_lbl = new JLabel(
-				"Particle line indentifier: ");
+		final JLabel particleIdentifier_lbl = new JLabel("Line indentifier: ");
 		particleIdentifier_lbl
 				.setToolTipText("<html><p width=\"500\">"
 						+ OmegaDataToolConstants.PARTICLE_IDENTIFIER_TT
@@ -212,17 +211,16 @@ protected void createAndAddWidgets() {
 				.setPreferredSize(OmegaConstants.LARGE_TEXT_SIZE);
 		particleIdentifierPanel.add(this.particleIdentifier_txt);
 		this.fieldsPanel.add(particleIdentifierPanel);
-		
+
 		final JPanel particleStartPanel = new JPanel();
 		particleStartPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
-		final JLabel particleStart_lbl = new JLabel(
-				"Particle index starts at 1: ");
+		final JLabel particleStart_lbl = new JLabel("Indexes start at 1: ");
 		particleStart_lbl.setPreferredSize(OmegaConstants.BUTTON_SIZE_LARGE);
 		particleStartPanel.add(particleStart_lbl);
 		this.startAtOne_ckb = new JCheckBox();
 		particleStartPanel.add(this.startAtOne_ckb);
 		this.fieldsPanel.add(particleStartPanel);
-		
+
 		final JPanel nonParticleIdentifierPanel = new JPanel();
 		nonParticleIdentifierPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
 		final JLabel nonParticleIdentifier_lbl = new JLabel(
@@ -238,7 +236,7 @@ protected void createAndAddWidgets() {
 				.setPreferredSize(OmegaConstants.LARGE_TEXT_SIZE);
 		nonParticleIdentifierPanel.add(this.nonParticleIdentifier_txt);
 		this.fieldsPanel.add(nonParticleIdentifierPanel);
-		
+
 		final JPanel particleSeparatorIdentifierPanel = new JPanel();
 		particleSeparatorIdentifierPanel.setLayout(new FlowLayout(
 				FlowLayout.LEFT));
@@ -253,7 +251,7 @@ protected void createAndAddWidgets() {
 		particleSeparatorIdentifierPanel
 				.add(this.particleSeparatordentifier_txt);
 		this.fieldsPanel.add(particleSeparatorIdentifierPanel);
-		
+
 		final JPanel particleDataPanel = new JPanel();
 		particleDataPanel.setLayout(new BorderLayout(5, 5));
 		particleDataPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
@@ -308,37 +306,37 @@ protected void createAndAddWidgets() {
 				BorderLayout.NORTH);
 		particleDataButtonPanelMain.add(new JLabel(), BorderLayout.CENTER);
 		particleDataPanel.add(particleDataButtonPanelMain, BorderLayout.EAST);
-		
+
 		fieldsPanelMain.add(this.fieldsPanel, BorderLayout.NORTH);
 		fieldsPanelMain.add(particleDataPanel, BorderLayout.CENTER);
-		
+
 		mainPanel.add(fieldsPanelMain, BorderLayout.NORTH);
 		mainPanel.add(new JLabel(), BorderLayout.CENTER);
 		this.add(mainPanel, BorderLayout.CENTER);
-		
+
 		final JPanel bottomPanel = new JPanel();
 		bottomPanel.setLayout(new BorderLayout());
-		
+
 		final JPanel buttPanel = new JPanel();
 		buttPanel.setLayout(new FlowLayout(FlowLayout.RIGHT));
-		
+
 		this.action_btt = new JButton();
 		this.action_btt.setPreferredSize(OmegaConstants.BUTTON_SIZE);
 		buttPanel.add(this.action_btt);
-		
+
 		this.close_btt = new JButton(OmegaGUIConstants.MENU_FILE_CLOSE);
 		this.close_btt.setPreferredSize(OmegaConstants.BUTTON_SIZE);
 		buttPanel.add(this.close_btt);
-		
+
 		bottomPanel.add(buttPanel, BorderLayout.NORTH);
-		
+
 		this.statusPanel = new GenericStatusPanel(1);
 		this.updateStatus("Ready!");
 		bottomPanel.add(this.statusPanel, BorderLayout.SOUTH);
-		
+
 		this.add(bottomPanel, BorderLayout.SOUTH);
 	}
-	
+
 	@Override
 	protected void addListeners() {
 		this.chooseFile_btt.addActionListener(new ActionListener() {
@@ -366,7 +364,7 @@ public void actionPerformed(final ActionEvent e) {
 				OmegaTracksToolDialog.this.handleAddData();
 			}
 		});
-
+		
 		this.addStandardData_btt.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(final ActionEvent e) {
@@ -404,7 +402,7 @@ public void actionPerformed(final ActionEvent e) {
 			};
 		});
 	}
-	
+
 	private void handleExtensionSelection() {
 		final String ext = (String) this.extension_cmb.getSelectedItem();
 		this.particleSeparatordentifier_txt.setEnabled(true);
@@ -413,7 +411,7 @@ private void handleExtensionSelection() {
 			this.particleSeparatordentifier_txt.setEnabled(false);
 		}
 	}
-	
+
 	private void handleAddStandardData() {
 		this.pickDialog.reset();
 		final String[] data = { OmegaDataToolConstants.PARTICLE_CENT_INTENSITY,
@@ -432,7 +430,7 @@ private void handleAddStandardData() {
 			this.particleData_mdl.addElement(toInsert);
 		}
 	}
-	
+
 	private void handleAddData() {
 		this.insertDialog.reset();
 		this.insertDialog.setVisible(true);
@@ -447,13 +445,13 @@ private void handleAddData() {
 			this.particleData_mdl.addElement(toInsert);
 		}
 	}
-	
+
 	private void handleMoveDataUp() {
 		final int index = this.particleData_mdl.indexOf(this.selectedVal);
 		this.particleData_mdl.insertElementAt(this.selectedVal, index - 1);
 		this.particleData_mdl.remove(index + 1);
 	}
-	
+
 	private void handleMoveDataDown() {
 		final int index = this.particleData_mdl.indexOf(this.selectedVal);
 		int newIndex = index + 2;
@@ -463,11 +461,11 @@ private void handleMoveDataDown() {
 		this.particleData_mdl.insertElementAt(this.selectedVal, newIndex);
 		this.particleData_mdl.remove(index);
 	}
-	
+
 	private void handleRemoveData() {
 		this.particleData_mdl.removeElement(this.selectedVal);
 	}
-	
+
 	private void handleListSelection() {
 		this.moveDataUp_btt.setEnabled(false);
 		this.moveDataDown_btt.setEnabled(false);
@@ -505,15 +503,15 @@ private void handleListSelection() {
 		// }
 		// }
 	}
-	
+
 	private void handleMultipleFilesSelection() {
 		// if (this.multipleFiles_ckb.isSelected()) {
 		// this.fileIdentifier_txt.setEnabled(true);
 		// } else {
 		// this.fileIdentifier_txt.setEnabled(false);
 		// }
 	}
-	
+
 	private void handleChooseFile() {
 		final int result = this.fileChooser.showOpenDialog(this);
 		if (result == JFileChooser.APPROVE_OPTION) {
@@ -523,7 +521,7 @@ private void handleChooseFile() {
 			this.file_txt.setText("");
 		}
 	}
-	
+
 	private void handleAction() {
 		if (this.otio instanceof OmegaTracksImporter) {
 			final OmegaTracksImporter oti = (OmegaTracksImporter) this.otio;
@@ -565,7 +563,7 @@ private void handleAction() {
 			this.updateStatus("A directory is required to begin the process!");
 			return;
 		}
-
+		
 		final File f = new File(fName);
 		if (f.isFile()) {
 			this.updateStatus(f.getName()
@@ -622,21 +620,25 @@ private void handleAction() {
 		}
 		if (this.otio instanceof OmegaTracksExporter) {
 			final OmegaTracksExporter ote = (OmegaTracksExporter) this.otio;
-			ote.reset();
+			ote.resetAll();
 		}
 		if (completed) {
 			this.setVisible(false);
 		}
 	}
-	
+
 	private void handleClose() {
 		this.setVisible(false);
 	}
 
+	public void disableFileName() {
+		this.fileIdentifier_txt.setEditable(false);
+	}
+	
 	public void setFileName(final String targetAnalysisName) {
 		this.fileIdentifier_txt.setText(targetAnalysisName);
 	}
-	
+
 	public void updateStatus(final String s) {
 		try {
 			this.statusPanel.updateStatus(0, s);