Merge branch 'master' into fix_ObjectDefNames

ome · Jan 18, 2021 · beda65d · beda65d
2 parents a60f419 + f369a29
commit beda65d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/org/openmicroscopy/shoola/agents/fsimporter/mde/MetaDataDialog.java b/src/main/java/org/openmicroscopy/shoola/agents/fsimporter/mde/MetaDataDialog.java
@@ -210,6 +210,8 @@ public MetaDataDialog(JFrame owner, FileFilter[] filters, int type,
 		this.importer = importer;
 		this.mdeConfigPath=mdeConfigPath+File.separator+"mdeConfiguration.xml";
 
+		ImporterAgent.getRegistry().getLogger().info(this,"MetadataDialog: Use mdeConfiguration file at "+this.mdeConfigPath);
+
 		addImportButtonLink(importBtn);
 		addCancelImportButtonLink(cancelImportBtn);
 		setClosable(false);

diff --git a/src/main/java/org/openmicroscopy/shoola/agents/fsimporter/mde/util/TagData.java b/src/main/java/org/openmicroscopy/shoola/agents/fsimporter/mde/util/TagData.java
@@ -580,6 +580,13 @@ public void keyPressed(KeyEvent e) {
 //			inputField.setPreferredSize(new Dimension(250,20));
 			break;
 		default:
+			ImporterAgent.getRegistry().getLogger().warn(this,"[MDE] Unknown type for inputField "+getTagName()+"-> generate Textfield instead");
+			inputField=new JTextField(10);
+			setValTextField(inputField);
+			((JTextField) inputField).addActionListener(fieldActionListener);
+			inputField.addFocusListener(listener);
+			inputField.addKeyListener(listenerKey);
+			inputField.setToolTipText(tagInfo);
 			break;
 		}
 		setTagValue(value);

diff --git a/src/main/java/org/openmicroscopy/shoola/env/Environment.java b/src/main/java/org/openmicroscopy/shoola/env/Environment.java
@@ -164,7 +164,7 @@ public String getOmeroHome()
 	public String getMDEConfigPath()
 	{
 		return (String)
-			container.getRegistry().lookup(LookupNames.USER_HOME_OMERO);
+			container.getRegistry().lookup(LookupNames.USER_MDE_PATH);
 	}
 
 	/**