[med-svn] [mesquite] 02/02: Remove more Mac specific stuff

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository mesquite.

commit b6ad927d7b9744fc85b4e57d6d333c0992d4fae3
Author: Andreas Tille <tille at debian.org>
Date:   Mon May 23 22:53:23 2016 +0200

    Remove more Mac specific stuff
---
 debian/patches/do_not_import_apple_jar.patch | 66 ++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/debian/patches/do_not_import_apple_jar.patch b/debian/patches/do_not_import_apple_jar.patch
index 2ae8dad..bb68325 100644
--- a/debian/patches/do_not_import_apple_jar.patch
+++ b/debian/patches/do_not_import_apple_jar.patch
@@ -8,6 +8,72 @@
  import javax.swing.*;
  
  /* ======================================================================== */
+@@ -1064,20 +1063,6 @@ public class MesquiteFile extends Listen
+ 					return;
+ 				File writingFile = new File(writingFileName);
+ 				String setFileType = "MESQ";
+-				if (isNexus && writingFile.exists()){
+-					try {
+-						MRJOSType type = MRJFileUtils.getFileCreator(writingFile);
+-						String ts = null;
+-						if (type !=null)
+-							ts = type.toString();
+-
+-						if  (type != null && !StringUtil.blank(ts)) {
+-							setFileType = ts;
+-						}
+-					}
+-					catch (Throwable t){
+-					}
+-				}
+ 				if (autoCopySuffix == null && numBackups>0){
+ 					File bkpDir = new File(backupDirPath);
+ 					bkpDir.mkdirs();
+@@ -1101,8 +1086,6 @@ public class MesquiteFile extends Listen
+ 						if (MesquiteTrunk.isWindows())
+ 							MesquiteMessage.warnProgrammer("If you are working on a Windows machine, you may have modified the original file with another program, which may mysteriously prevent you from modifying it in Mesquite.  This appears to be a bug in Windows.   Try duplicating the file, or using Save As in Mesquite to make a new copy of the file which should be free of the problem, or using another operating system.");
+ 					}
+-					try {MRJFileUtils.setFileTypeAndCreator(writingFile, new MRJOSType("TEXT"), new MRJOSType(setFileType));}
+-					catch (Throwable t){}
+ 				}
+ 			}
+ 			catch (IOException ioe){}
+@@ -2905,8 +2888,6 @@ public class MesquiteFile extends Listen
+ 					}
+ 				}
+ 				stream.close();
+-				try {MRJFileUtils.setFileTypeAndCreator(new File(relativePath), new MRJOSType("TEXT"), new MRJOSType("R*ch"));}
+-				catch (Throwable t){}
+ 			}
+ 			catch( FileNotFoundException e ) {
+ 				MesquiteMessage.warnProgrammer( "File Busy or Not Found:  put file contents (0)");
+@@ -2950,8 +2931,6 @@ public class MesquiteFile extends Listen
+ 					}
+ 				}
+ 				stream.close();
+-				try {MRJFileUtils.setFileTypeAndCreator(new File(relativePath), new MRJOSType("TEXT"), new MRJOSType("R*ch"));}
+-				catch (Throwable t){}
+ 			}
+ 			catch( FileNotFoundException e ) {
+ 				MesquiteMessage.warnProgrammer( "File Busy or Not Found: put file contents  (1) [" + relativePath + "]");
+@@ -2999,8 +2978,6 @@ public class MesquiteFile extends Listen
+ 					stream.write(contents);
+ 					stream.flush();
+ 					stream.close();
+-					try {MRJFileUtils.setFileTypeAndCreator(new File(relativePath), new MRJOSType("TEXT"), new MRJOSType("R*ch"));}
+-					catch (Throwable t){}
+ 				}
+ 			}
+ 			catch( FileNotFoundException e ) {
+@@ -3160,8 +3137,6 @@ public class MesquiteFile extends Listen
+ 		if (logStream!=null) {
+ 			logStream.close();
+ 			logStream = null;
+-			try {MRJFileUtils.setFileTypeAndCreator(new File(MesquiteModule.userDirectory + fileSeparator + "Mesquite_Support_Files" + fileSeparator + MesquiteTrunk.logFileName), new MRJOSType("TEXT"), new MRJOSType("R*ch"));}
+-			catch (Throwable t){}
+ 		}
+ 	}
+ 	/*.................................................................................................................*/
 --- a/Source/mesquite/Mesquite.java
 +++ b/Source/mesquite/Mesquite.java
 @@ -22,9 +22,6 @@ import java.net.*;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mesquite.git