1 files changed, 33 insertions, 33 deletions

diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java
index 35670f498..32103b084 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java
@@ -24,15 +24,15 @@ import org.eclipse.team.core.*;
  * TODO: implement extension point
  */
 public class FileContentManager implements IFileContentManager {
-    
+
     private static final String PREF_TEAM_EXTENSION_TYPES= "file_types"; //$NON-NLS-1$
     private static final String PREF_TEAM_FILENAME_TYPES= "cvs_mode_for_file_without_extensions"; //$NON-NLS-1$
 
     private static class StringMapping implements IStringMapping {
-        
+
         private final String fString;
         private final int fType;
-        
+
         public StringMapping(String string, int type) {
             fString= string;
             fType= type;
@@ -46,13 +46,13 @@ public class FileContentManager implements IFileContentManager {
             return fType;
         }
     }
-    
+
     private static class UserExtensionMappings extends UserStringMappings {
-        
+
         public UserExtensionMappings(String key) {
             super(key);
         }
-        
+
         protected Map loadMappingsFromPreferences() {
             final Map result= super.loadMappingsFromPreferences();
             if (loadMappingsFromOldWorkspace(result)) {
@@ -60,25 +60,25 @@ public class FileContentManager implements IFileContentManager {
             }
             return result;
         }
-        
+
         /**
          * If the workspace is an old 2.0 one, read the old file and delete it.
-         * 
-         * @param A map where the new mappings should be added. 
-         * 
+         *
+         * @param A map where the new mappings should be added.
+         *
          * @return true if the workspace was a 2.0 one and the old mappings have
          * been added to the map, false otherwise.
-         * 
+         *
          */
         private boolean loadMappingsFromOldWorkspace(Map map) {
             // File name of the persisted file type information
             String STATE_FILE = ".fileTypes"; //$NON-NLS-1$
             IPath pluginStateLocation = TeamPlugin.getPlugin().getStateLocation().append(STATE_FILE);
             File f = pluginStateLocation.toFile();
-            
-            if (!f.exists()) 
+
+            if (!f.exists())
                 return false;
-            
+
             try {
                 DataInputStream input = new DataInputStream(new FileInputStream(f));
                 try {
@@ -93,10 +93,10 @@ public class FileContentManager implements IFileContentManager {
             }
             return true;
         }
-        
+
         /**
          * Read the saved file type state from the given input stream.
-         * 
+         *
          * @param input the input stream to read the saved state from
          * @throws IOException if an I/O problem occurs
          */
@@ -118,46 +118,46 @@ public class FileContentManager implements IFileContentManager {
             return result;
         }
     }
-    
+
     private final UserStringMappings fUserExtensionMappings, fUserNameMappings;
     private PluginStringMappings fPluginExtensionMappings;//, fPluginNameMappings;
     private IContentType textContentType;
-    
+
     public FileContentManager() {
         fUserExtensionMappings= new UserExtensionMappings(PREF_TEAM_EXTENSION_TYPES);
         fUserNameMappings= new UserStringMappings(PREF_TEAM_FILENAME_TYPES);
         fPluginExtensionMappings= new PluginStringMappings(TeamPlugin.FILE_TYPES_EXTENSION, "extension"); //$NON-NLS-1$
     }
-    
+
     public int getTypeForName(String filename) {
         final int userType= fUserNameMappings.getType(filename);
 //        final int pluginType= fPluginNameMappings.getType(filename);
 //        return userType != Team.UNKNOWN ? userType : pluginType;
         return userType;
     }
-    
+
     public int getTypeForExtension(String extension) {
         final int userType= fUserExtensionMappings.getType(extension);
         final int pluginType= fPluginExtensionMappings.getType(extension);
         return userType != Team.UNKNOWN ? userType : pluginType;
     }
-    
+
     public void addNameMappings(String[] names, int [] types) {
         fUserNameMappings.addStringMappings(names, types);
     }
-    
+
     public void addExtensionMappings(String[] extensions, int [] types) {
         fUserExtensionMappings.addStringMappings(extensions, types);
     }
-    
+
     public void setNameMappings(String[] names, int [] types) {
         fUserNameMappings.setStringMappings(names, types);
     }
-    
+
     public void setExtensionMappings(String[] extensions, int [] types) {
         fUserExtensionMappings.setStringMappings(extensions, types);
     }
-    
+
     public IStringMapping[] getNameMappings() {
         return getMappings(fUserNameMappings, null);//fPluginNameMappings);
     }
@@ -168,15 +168,15 @@ public class FileContentManager implements IFileContentManager {
 
     public int getType(IStorage storage) {
         int type;
-        
+
         final String name= storage.getName();
-        if (name != null && (type= getTypeForName(name)) != Team.UNKNOWN) 
+        if (name != null && (type= getTypeForName(name)) != Team.UNKNOWN)
             return type;
-        
+
         final String extension= getFileExtension(name);
         if (extension != null && (type= getTypeForExtension(extension)) != Team.UNKNOWN)
             return type;
-        
+
         IContentType contentType = Platform.getContentTypeManager().findContentTypeFor(name);
         if (contentType != null) {
             IContentType textType = getTextContentType();
@@ -193,7 +193,7 @@ public class FileContentManager implements IFileContentManager {
             textContentType = Platform.getContentTypeManager().getContentType(IContentTypeManager.CT_TEXT);
         return textContentType;
     }
-    
+
     public IStringMapping[] getDefaultNameMappings() {
         // TODO: There is currently no extension point for this
         return new IStringMapping[0];//getStringMappings(fPluginNameMappings.referenceMap());
@@ -212,9 +212,9 @@ public class FileContentManager implements IFileContentManager {
         return fUserNameMappings.referenceMap().containsKey(filename);
 //        || fPluginNameMappings.referenceMap().containsKey(filename);
     }
-    
+
     private static String getFileExtension(String name) {
-        if (name == null) 
+        if (name == null)
             return null;
         int index = name.lastIndexOf('.');
         if (index == -1)
@@ -233,7 +233,7 @@ public class FileContentManager implements IFileContentManager {
         }
         return result;
     }
-    
+
     private IStringMapping [] getMappings(UserStringMappings userMappings, PluginStringMappings pluginMappings) {
         final Map mappings= new HashMap();
         if (pluginMappings != null)