Changeset 5658

Timestamp:

10/09/08 09:59:29 (6 weeks ago)

Author:

jburel

Message:

Fixed problem with file filters

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/env/data/DataServicesFactory.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/util/filter/file/CustomizedFileFilter.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/util/filter/file/EditorFileFilter.java (modified) (1 diff)

trunk/.classpath

@@ -12 +12 @@
         <classpathentry kind="lib" path="LIB/commons-codec-1.3.jar"/>
         <classpathentry kind="lib" path="LIB/commons-httpclient-3.0.1.jar"/>
-        <classpathentry kind="lib" path="LIB/looks-2.0.1.jar"/>
         <classpathentry kind="lib" path="LIB/JHotDraw-7.0.9.jar"/>
         <classpathentry kind="lib" path="LIB/commons-validator.jar"/>

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

@@ -209 +209 @@
                         UserCredentials uc = (UserCredentials) 
                                 container.getRegistry().lookup(LookupNames.USER_CREDENTIALS);
+                        ((OmeroImageServiceImpl) is).shutDown();
                         omeroGateway.reconnect(uc.getUserName(), uc.getPassword());
                         } catch (Exception e) {

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

@@ -60 +60 @@
         {
                 if (name == null || extensions == null) return false;
+                for (int i = 0; i < extensions.length; i++) {
+                        if (name.endsWith("."+extensions[i])) return true;
+                }
+                return false;
+                /*
+                if (name == null || extensions == null) return false;
                 String extension = null;
                 int i = name.lastIndexOf('.');
@@ -68 +74 @@
                         if (extension.equals(extensions[j])) return true;
                 return false;
+                */
         }
         

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

@@ -52 +52 @@
         public static final String      PRO_XML = "pro.xml";
         
-        /** Possible file extensions. */
-        public static final String      XML = "xml";
-        
         /** The possible extensions. */
         private static final String[] extensions;
         
         static {
-                extensions = new String[2];
+                extensions = new String[1];
                 extensions[0] = PRO_XML;
-                extensions[1] = XML;
         }
-        
+
         /**
          *      Overriden to return the extension of the filter.