Merge pull request #75 from OHDSI/index-build-warnings

Index build warnings

src/org/ohdsi/usagi/ui/RebuildIndexDialog.java

@@ -58,13 +58,12 @@ public RebuildIndexDialog() {
 	private void buildIndex() {
 		String vocabFolder = vocabFolderField.getText();
 		String loincFile = loincFileField.getText();
-		if (!(new File(vocabFolder + "/CONCEPT.csv").exists())) {
-			JOptionPane.showMessageDialog(this, "Vocabulary file CONCEPT.csv not found", "Cannot build index", JOptionPane.ERROR_MESSAGE);
-			return;
-		}
-		if (!(new File(vocabFolder + "/CONCEPT_SYNONYM.csv").exists())) {
-			JOptionPane.showMessageDialog(this, "Vocabulary file CONCEPT_SYNONYM.csv not found", "Cannot build index", JOptionPane.ERROR_MESSAGE);
-			return;
+		String[] requiredVocabularyFiles = {"/CONCEPT.csv", "/CONCEPT_SYNONYM.csv", "/VOCABULARY.csv", "/CONCEPT_RELATIONSHIP.csv"};
+		for (String vocabFileName : requiredVocabularyFiles) {
+			if (!(new File(vocabFolder + vocabFileName).exists())) {
+				JOptionPane.showMessageDialog(this, "Vocabulary file " + vocabFileName + " not found", "Cannot build index", JOptionPane.ERROR_MESSAGE);
+				return;
+			}
 		}
 		if (loincCheckBox.isSelected() && !(new File(loincFile).exists())) {
 			JOptionPane.showMessageDialog(this, "LOINC file loinc.csv not found", "Cannot build index", JOptionPane.ERROR_MESSAGE);

src/org/ohdsi/usagi/ui/ShowStatsDialog.java

@@ -38,12 +38,6 @@ public class ShowStatsDialog extends JDialog {
 	private static final long	serialVersionUID	= 2028328868610404663L;
 
 	public ShowStatsDialog() {
-		String versionFileName = Global.folder + "/vocabularyVersion.txt";
-		String version = "Unknown";
-		if (new File(versionFileName).exists()) {
-			for (String line : new ReadTextFile(versionFileName))
-			  version = line;
-		} 
 		int termCount = Global.usagiSearchEngine.getTermCount();
 		BerkeleyDbStats berkeleyDbStats = Global.dbEngine.getStats();
 		NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
@@ -62,7 +56,7 @@ public ShowStatsDialog() {
 
 		g.gridx = 1;
 		g.gridy = 0;
-		add(new JLabel(version), g);
+		add(new JLabel(Global.vocabularyVersion), g);
 
 		g.gridx = 0;
 		g.gridy = 1;

src/org/ohdsi/usagi/ui/UsagiMain.java

@@ -49,7 +49,11 @@ public UsagiMain(String[] args) {
 
 		// Initialize global variables:
 		Global.mapping = new Mapping();
-		Global.folder = new File("").getAbsolutePath();
+		if (args.length == 1) {
+			Global.folder = args[0];
+		} else {
+			Global.folder = new File("").getAbsolutePath();
+		}
 		Global.usagiSearchEngine = new UsagiSearchEngine(Global.folder);
 		Global.dbEngine = new BerkeleyDbEngine(Global.folder);
 		if (Global.usagiSearchEngine.mainIndexExists()) {
@@ -121,9 +125,7 @@ public void windowClosing(WindowEvent e) {
 		if (!Global.usagiSearchEngine.mainIndexExists())
 			Global.rebuildIndexAction.actionPerformed(null);
 
-		if (args.length == 1) {
-			Global.folder = args[0];
-		} else if (args.length > 1 && args[0].equals("--file")) {
+		if (args.length > 1 && args[0].equals("--file")) {
 			OpenAction.open(new File(args[1]));
 		}
 	}

src/org/ohdsi/usagi/ui/actions/AboutAction.java

@@ -31,7 +31,7 @@ public class AboutAction extends AbstractAction {
 	public AboutAction() {
 		putValue(Action.NAME, "About Usagi");
 		putValue(Action.SHORT_DESCRIPTION, "About Usagi");
-		putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_A));
+		putValue(Action.MNEMONIC_KEY, KeyEvent.VK_A);
 	}
 
 	@Override

src/org/ohdsi/usagi/ui/actions/ApproveAction.java

@@ -31,7 +31,7 @@ public class ApproveAction extends AbstractAction {
 	public ApproveAction() {
 		putValue(Action.NAME, "Approve");
 		putValue(Action.SHORT_DESCRIPTION, "Approve the selected single mapping");
-		putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_A));
+		putValue(Action.MNEMONIC_KEY, KeyEvent.VK_A);
 		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, ActionEvent.ALT_MASK));
 	}
 

src/org/ohdsi/usagi/ui/actions/ConceptInformationAction.java

@@ -31,7 +31,7 @@ public class ConceptInformationAction extends AbstractAction {
 	public ConceptInformationAction() {
 		putValue(Action.NAME, "Concept information");
 		putValue(Action.SHORT_DESCRIPTION, "Show additional concept information");
-		putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_C));
+		putValue(Action.MNEMONIC_KEY, KeyEvent.VK_C);
 		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C, ActionEvent.ALT_MASK));
 	}
 

src/org/ohdsi/usagi/ui/actions/RebuildIndexAction.java

@@ -30,7 +30,7 @@ public class RebuildIndexAction extends AbstractAction {
 	public RebuildIndexAction() {
 		putValue(Action.NAME, "Rebuild index");
 		putValue(Action.SHORT_DESCRIPTION, "Rebuild the index from the vocabulary data files");
-		putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_R));
+		putValue(Action.MNEMONIC_KEY, KeyEvent.VK_R);
 	}
 
 	@Override

src/org/ohdsi/usagi/ui/actions/ShowStatsAction.java

@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2019 Observational Health Data Sciences and Informatics
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@ public class ShowStatsAction extends AbstractAction {
 	public ShowStatsAction() {
 		putValue(Action.NAME, "Show index statistics");
 		putValue(Action.SHORT_DESCRIPTION, "Show index stats");
-		putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_S));
+		putValue(Action.MNEMONIC_KEY, KeyEvent.VK_S);
 	}
 
 	@Override