Changeset 5685

Timestamp:

10/14/08 09:58:19 (7 weeks ago)

Author:

jburel

Message:

Add control to control the file attached to a given object. see ticket #673

Location:

trunk/SRC/org/openmicroscopy/shoola

Files:

• agents/metadata/editor/AttachmentsUI.java (modified) (2 diffs)
• env/data/OMEROGateway.java (modified) (1 diff)

trunk/SRC/org/openmicroscopy/shoola/agents/metadata/editor/AttachmentsUI.java

@@ -73 +73 @@
 
 //Application-internal dependencies
+import org.openmicroscopy.shoola.agents.editor.EditorAgent;
 import org.openmicroscopy.shoola.agents.metadata.IconManager;
 import org.openmicroscopy.shoola.agents.metadata.MetadataViewerAgent;
@@ -988 +989 @@
                 Iterator i = addedFiles.iterator();
                 File f;
+                List<File> notSupported = new ArrayList<File>();
+                FileAnnotationData data = null;
                 while (i.hasNext()) {
                         f = (File) i.next();
-                        toAdd.add(new FileAnnotationData(f));
+                        try {
+                                data = new FileAnnotationData(f);
+                        } catch (Exception e) {
+                                notSupported.add(f);
+                                data = null;
+                        }
+                        if (data != null) toAdd.add(data);
+                }
+                if (notSupported.size() > 0) {
+                        UserNotifier un = EditorAgent.getRegistry().getUserNotifier();
+                        Iterator<File> k = notSupported.iterator();
+                        String s = "";
+                        while (k.hasNext()) {
+                                s += (k.next()).getName();
+                                s += " ";
+                        }
+                        un.notifyInfo("Attach", 
+                                        "The following files cannot be attached: \n"+s);
                 }
                 if (addedFileAnnotations.size() > 0)

trunk/SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java

@@ -41 +41 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.ResourceBundle;
 import java.util.Set;