Context Navigation

← Previous Changeset
Next Changeset →

Changeset 5633

Timestamp:

09/29/08 13:39:07 (8 weeks ago)

Author:

jburel

Message:

Improved file filter

Location:

trunk/SRC/org/openmicroscopy/shoola

Files:

: 17 modified

agents/editor/EditorAgent.java (modified) (2 diffs)
util/filter/file/BMPFilter.java (modified) (2 diffs)
util/filter/file/CSVFilter.java (modified) (3 diffs)
util/filter/file/CustomizedFileFilter.java (modified) (1 diff)
util/filter/file/DVFilter.java (modified) (2 diffs)
util/filter/file/EditorFileFilter.java (modified) (3 diffs)
util/filter/file/ExcelFilter.java (modified) (3 diffs)
util/filter/file/HTMLFilter.java (modified) (2 diffs)
util/filter/file/JPEGFilter.java (modified) (2 diffs)
util/filter/file/PDFFilter.java (modified) (2 diffs)
util/filter/file/PNGFilter.java (modified) (2 diffs)
util/filter/file/PowerPointFilter.java (modified) (2 diffs)
util/filter/file/RegExFileFilter.java (modified) (10 diffs)
util/filter/file/TEXTFilter.java (modified) (2 diffs)
util/filter/file/TIFFFilter.java (modified) (2 diffs)
util/filter/file/WordFilter.java (modified) (2 diffs)
util/filter/file/XMLFilter.java (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/SRC/org/openmicroscopy/shoola/agents/editor/EditorAgent.java

r5614	r5633
92	92	String name = event.getFileName();
93	93	if (name == null) return;
94		if (!name.endsWith(EditorFileFilter.PRO_XML)) return;
	94	EditorFileFilter filter = new EditorFileFilter();
	95	if (!filter.accept(name)) return;
95	96	Editor editor = EditorFactory.getEditor(name,
96	97	event.getFileID(), event.getFileSize());
…	…
171	172	handleShowEditor();
172	173	}
173
174		/**
175		* This was an attempted shortcut to directly start OMERO.editor
176		* without Insight and a server connection.
177		* However, I get a NPE becuase there is no Registry!
178		*
179		* @param args
180		*/
181		~~public static void main(String[] args) {~~
182
183		~~File testFile = new File~~
184		~~("/Users/will/xmlProtocols/demoForRelease/AllFields.pro.xml");~~
185		/*
186		~~Editor editor = EditorFactory.getEditor(testFile);~~
187
188		~~if (editor != null) {~~
189		~~editor.setFileToEdit(testFile);~~
190		}
191		*/
192	174
193		}
194	175	}

trunk/SRC/org/openmicroscopy/shoola/util/filter/file/BMPFilter.java

r5099	r5633
58	58	public static final String DIB = "dib";
59	59
	60	/** The possible extensions. */
	61	private static final String[] extensions;
	62
	63	static {
	64	extensions = new String[2];
	65	extensions[0] = BMP;
	66	extensions[1] = DIB;
	67	}
	68
60	69	/**
61	70	* Overriden to return the extension of the filter.
…	…
76	85	public boolean accept(File f)
77	86	{
	87	if (f == null) return false;
78	88	if (f.isDirectory()) return true;
79		String s = f.getName();
80		String extension = null;
81		int i = s.lastIndexOf('.');
82		if (i > 0 && i < s.length()-1)
83		extension = s.substring(i+1).toLowerCase();
84		if (extension != null)
85		return ((extension.equals(BMP) \|\| extension.equals(DIB)));
86		return false;
	89	return isSupported(f.getName(), extensions);
	90	}
	91
	92	/**
	93	* Overridden to accept the file identified by its name.
	94	* @see CustomizedFileFilter#accept(String)
	95	*/
	96	public boolean accept(String fileName)
	97	{
	98	return isSupported(fileName, extensions);
87	99	}
88	100

trunk/SRC/org/openmicroscopy/shoola/util/filter/file/CSVFilter.java

r5288	r5633
23	23	package org.openmicroscopy.shoola.util.filter.file;
24	24
25		~~import java.io.File;~~
26	25
27		~~import javax.swing.filechooser.FileFilter;~~
28	26
29	27	//Java imports
	28	import java.io.File;
	29	import javax.swing.filechooser.FileFilter;
30	30
31	31	//Third-party libraries
…	…
54	54	public static final String CSV = "csv";
55	55
	56	/** The possible extensions. */
	57	private static final String[] extensions;
	58
	59	static {
	60	extensions = new String[1];
	61	extensions[0] = CSV;
	62	}
	63
56	64	/**
57	65	* Overriden to return the extension of the filter.
…	…
72	80	public boolean accept(File f)
73	81	{
	82	if (f == null) return false;
74	83	if (f.isDirectory()) return true;
75		String s = f.getName();
76		String extension = null;
77		int i = s.lastIndexOf('.');
78		if (i > 0 && i < s.length()-1)
79		extension = s.substring(i+1).toLowerCase();
80		if (extension != null)
81		return (extension.equals(CSV));
82		return false;
	84	return isSupported(f.getName(), extensions);
83	85	}
84	86
	87	/**
	88	* Overridden to accept the file identified by its name.
	89	* @see CustomizedFileFilter#accept(String)
	90	*/
	91	public boolean accept(String fileName)
	92	{
	93	return isSupported(fileName, extensions);
	94	}
85	95	}
86	96

trunk/SRC/org/openmicroscopy/shoola/util/filter/file/CustomizedFileFilter.java

r5099	r5633
49	49
50	50	/**
	51	* Returns <code>true</code> if the file identified by the passed name
	52	* ends with one of the specified extensions, <code>false</code>
	53	* otherwise.
	54	*
	55	* @param name The name of the file.
	56	* @param extensions The supported extensions.
	57	* @return See above.
	58	*/
	59	protected boolean isSupported(String name, String[] extensions)
	60	{
	61	if (name == null \|\| extensions == null) return false;
	62	String extension = null;
	63	int i = name.lastIndexOf('.');
	64	if (i > 0 && i < name.length()-1)
	65	extension = name.substring(i+1).toLowerCase();
	66	if (extension == null) return false;
	67	for (int j = 0; j < extensions.length; j++)
	68	if (extension.equals(extensions[j])) return true;
	69	return false;
	70	}
	71
	72	/**
	73	* Returns <code>true</code> if the file identified by its name
	74	* is supported by the filter, <code>false</code> otherwise.
	75	*
	76	* @param fileName The name of the file.
	77	* @return See above.
	78	*/
	79	public abstract boolean accept(String fileName);
	80
	81	/**
51	82	* Returns the default extension of the file format.
52	83	*

trunk/SRC/org/openmicroscopy/shoola/util/filter/file/DVFilter.java

r5099	r5633
54	54	public static final String DV = "dv";
55	55
	56	/** The possible extensions. */
	57	private static final String[] extensions;
	58
	59	static {
	60	extensions = new String[1];
	61	extensions[0] = DV;
	62	}
	63
56	64	/**
57	65	* Overriden to return the extension of the filter.
…	…
72	80	public boolean accept(File f)
73	81	{
	82	if (f == null) return false;
74	83	if (f.isDirectory()) return true;
75		String s = f.getName();
76		String extension = null;
77		int i = s.lastIndexOf('.');
78		if (i > 0 && i < s.length()-1)
79		extension = s.substring(i+1).toLowerCase();
80		if (extension != null)
81		return (extension.equals(DV));
82		return false;
	84	return isSupported(f.getName(), extensions);
	85	}
	86
	87	/**
	88	* Overridden to accept the file identified by its name.
	89	* @see CustomizedFileFilter#accept(String)
	90	*/
	91	public boolean accept(String fileName)
	92	{
	93	return isSupported(fileName, extensions);
83	94	}
84	95

trunk/SRC/org/openmicroscopy/shoola/util/filter/file/EditorFileFilter.java

r5567	r5633
23	23	package org.openmicroscopy.shoola.util.filter.file;
24	24
25		~~import java.io.File;~~
26
27		~~import javax.swing.filechooser.FileFilter;~~
28	25
29	26	//Java imports
	27	import java.io.File;
	28	import javax.swing.filechooser.FileFilter;
30	29
31	30	//Third-party libraries
…	…
52	51	/** Possible file extensions. */
53	52	public static final String PRO_XML = "pro.xml";
54
	53
	54	/** The possible extensions. */
	55	private static final String[] extensions;
	56
	57	static {
	58	extensions = new String[1];
	59	extensions[0] = PRO_XML;
	60	}
	61
55	62	/**
56	63	* Overriden to return the extension of the filter.
…	…
66	73
67	74	/**
68		* Overriden to accept file with the declared file extensions.
	75	* Overridden to accept file with the declared file extensions.
69	76	* @see FileFilter#accept(File)
70	77	*/
71	78	public boolean accept(File f)
72	79	{
	80	if (f == null) return false;
73	81	if (f.isDirectory()) return true;
74		String s = f.getName();
75		String extension = null;
76		int i = s.lastIndexOf('.');
77		if (i > 0 && i < s.length()-1)
78		extension = s.substring(i+1).toLowerCase();
79		if (extension != null)
80		return ((extension.equals(PRO_XML)));
81		return false;
	82	return isSupported(f.getName(), extensions);
	83	}
	84
	85	/**
	86	* Overridden to accept the file identified by its name.
	87	* @see CustomizedFileFilter#accept(String)
	88	*/
	89	public boolean accept(String fileName)
	90	{
	91	return isSupported(fileName, extensions);
82	92	}
83	93

trunk/SRC/org/openmicroscopy/shoola/util/filter/file/ExcelFilter.java

r5288	r5633
28	28	import javax.swing.filechooser.FileFilter;
29	29
30
31	30	//Third-party libraries
32	31
…	…
53	52	public static final String EXCEL = "xls";
54	53
	54	/** The possible extensions. */
	55	private static final String[] extensions;
	56
	57	static {
	58	extensions = new String[1];
	59	extensions[0] = EXCEL;
	60	}
	61
55	62	/**
56	63	* Overriden to return the extension of the filter.
…	…
71	78	public boolean accept(File f)
72	79	{
73		if (f.isDirectory()) return true;
74		String s = f.getName();
75		String extension = null;
76		int i = s.lastIndexOf('.');
77		if (i > 0 && i < s.length()-1)
78		extension = s.substring(i+1).toLowerCase();
79		if (extension != null)
80		return (extension.equals(EXCEL));
81		return false;
	80	if (f == null) return false;
	81	if (f.isDirectory()) return true;
	82	return isSupported(f.getName(), extensions);
82	83	}
83	84
	85	/**
	86	* Overridden to accept the file identified by its name.
	87	* @see CustomizedFileFilter#accept(String)
	88	*/
	89	public boolean accept(String fileName)
	90	{
	91	return isSupported(fileName, extensions);
	92	}
	93
84	94	}

trunk/SRC/org/openmicroscopy/shoola/util/filter/file/HTMLFilter.java

r5288	r5633
55	55	public static final String HTM = "htm";
56	56
	57
	58	/** The possible extensions. */
	59	private static final String[] extensions;
	60
	61	static {
	62	extensions = new String[2];
	63	extensions[0] = HTML;
	64	extensions[1] = HTM;
	65	}
	66
57	67	/**
58	68	* Overriden to return the extension of the filter.
…	…
73	83	public boolean accept(File f)
74	84	{
75		if (f.isDirectory()) return true;
76		String s = f.getName();
77		String extension = null;
78		int i = s.lastIndexOf('.');
79		if (i > 0 && i < s.length()-1)
80		extension = s.substring(i+1).toLowerCase();
81		if (extension != null)
82		return (extension.equals(HTML) \|\| extension.equals(HTM));
83		return false;
	85	if (f == null) return false;
	86	if (f.isDirectory()) return true;
	87	return isSupported(f.getName(), extensions);
84	88	}
85	89
	90	/**
	91	* Overridden to accept the file identified by its name.
	92	* @see CustomizedFileFilter#accept(String)
	93	*/
	94	public boolean accept(String fileName)
	95	{
	96	return isSupported(fileName, extensions);
	97	}
	98
86	99	}

trunk/SRC/org/openmicroscopy/shoola/util/filter/file/JPEGFilter.java

r5099	r5633
61	61	public static final String JPE = "jpe";
62	62
	63	/** The possible extensions. */
	64	private static final String[] extensions;
	65
	66	static {
	67	extensions = new String[3];
	68	extensions[0] = JPEG;
	69	extensions[1] = JPG;
	70	extensions[2] = JPE;
	71	}
	72
63	73	/**
64	74	* Overriden to return the extension of the filter.
…	…
79	89	public boolean accept(File f)
80	90	{
	91	if (f == null) return false;
81	92	if (f.isDirectory()) return true;
82		String s = f.getName();
83		String extension = null;
84		int i = s.lastIndexOf('.');
85		if (i > 0 && i < s.length()-1)
86		extension = s.substring(i+1).toLowerCase();
87		if (extension != null)
88		return ((extension.equals(JPEG) \|\| extension.equals(JPG) \|\|
89		extension.equals(JPE)));
90		return false;
	93	return isSupported(f.getName(), extensions);
	94	}
	95
	96	/**
	97	* Overridden to accept the file identified by its name.
	98	* @see CustomizedFileFilter#accept(String)
	99	*/
	100	public boolean accept(String fileName)
	101	{
	102	return isSupported(fileName, extensions);
91	103	}
92	104

trunk/SRC/org/openmicroscopy/shoola/util/filter/file/PDFFilter.java

r5288	r5633
52	52	public static final String TEXT = "pdf";
53	53
	54	/** The possible extensions. */
	55	private static final String[] extensions;
	56
	57	static {
	58	extensions = new String[1];
	59	extensions[0] = TEXT;
	60	}
	61
54	62	/**
55	63	* Overriden to return the extension of the filter.
…	…
70	78	public boolean accept(File f)
71	79	{
72		if (f.isDirectory()) return true;
73		String s = f.getName();
74		String extension = null;
75		int i = s.lastIndexOf('.');
76		if (i > 0 && i < s.length()-1)
77		extension = s.substring(i+1).toLowerCase();
78		if (extension != null)
79		return (extension.equals(TEXT));
80		return false;
	80	if (f == null) return false;
	81	if (f.isDirectory()) return true;
	82	return isSupported(f.getName(), extensions);
81	83	}
82	84
	85	/**
	86	* Overridden to accept the file identified by its name.
	87	* @see CustomizedFileFilter#accept(String)
	88	*/
	89	public boolean accept(String fileName)
	90	{
	91	return isSupported(fileName, extensions);
	92	}
	93
83	94	}

trunk/SRC/org/openmicroscopy/shoola/util/filter/file/PNGFilter.java

r5099	r5633
54	54	public static final String PNG = "png";
55	55
	56	/** The possible extensions. */
	57	private static final String[] extensions;
	58
	59	static {
	60	extensions = new String[1];
	61	extensions[0] = PNG;
	62	}
	63
56	64	/**
57	65	* Overriden to return the extension of the filter.
…	…
72	80	public boolean accept(File f)
73	81	{
	82	if (f == null) return false;
74	83	if (f.isDirectory()) return true;
75		String s = f.getName();
76		String extension = null;
77		int i = s.lastIndexOf('.');
78		if (i > 0 && i < s.length()-1)
79		extension = s.substring(i+1).toLowerCase();
80		if (extension != null)
81		return (extension.equals(PNG));
82		return false;
	84	return isSupported(f.getName(), extensions);
	85	}
	86
	87	/**
	88	* Overridden to accept the file identified by its name.
	89	* @see CustomizedFileFilter#accept(String)
	90	*/
	91	public boolean accept(String fileName)
	92	{
	93	return isSupported(fileName, extensions);
83	94	}
84	95

trunk/SRC/org/openmicroscopy/shoola/util/filter/file/PowerPointFilter.java

r5317	r5633
55	55	public static final String PPT = "ppt";
56	56
	57	/** The possible extensions. */
	58	private static final String[] extensions;
	59
	60	static {
	61	extensions = new String[2];
	62	extensions[0] = PPS;
	63	extensions[1] = PPT;
	64	}
	65
57	66	/**
58	67	* Overriden to return the extension of the filter.
…	…
76	85	public boolean accept(File f)
77	86	{
78		if (f.isDirectory()) return true;
79		String s = f.getName();
80		String extension = null;
81		int i = s.lastIndexOf('.');
82		if (i > 0 && i < s.length()-1)
83		extension = s.substring(i+1).toLowerCase();
84		if (extension != null)
85		return (extension.equals(PPT));
86		return false;
	87	if (f == null) return false;
	88	if (f.isDirectory()) return true;
	89	return isSupported(f.getName(), extensions);
87	90	}
88	91
	92	/**
	93	* Overridden to accept the file identified by its name.
	94	* @see CustomizedFileFilter#accept(String)
	95	*/
	96	public boolean accept(String fileName)
	97	{
	98	return isSupported(fileName, extensions);
	99	}
	100
89	101	}

trunk/SRC/org/openmicroscopy/shoola/util/filter/file/RegExFileFilter.java

r5134	r5633
27	27	import java.io.File;
28	28	import java.util.regex.Pattern;
29
30	29	import javax.swing.filechooser.FileFilter;
31	30
…	…
35	34
36	35	/**
37		*
	36	* A file filter for regular expressions.
38	37	*
39	38	* @author Jean-Marie Burel
…	…
47	46	* @since OME3.0
48	47	*/
49		/**
50		* This is a regular expression file filter.
51		*/
52	48	public class RegExFileFilter
53	49	extends CustomizedFileFilter
…	…
59	55	/** The regular expression used to match files, this could be a converted
60	56	* version if user using wildCards */
61		String regEx;
	57	private String regEx;
62	58
63	59