Changeset 1274 for trunk

Timestamp:

03/29/19 16:46:34 (5 years ago)

Author:

bln4

Message:

Consistency of FrameIO path names

Location:

trunk/src/org/expeditee

Files:

• actions/IDE.java (modified) (3 diffs)
• actions/Misc.java (modified) (1 diff)
• gui/FrameIO.java (modified) (6 diffs)
• io/AbstractHTMLWriter.java (modified) (1 diff)
• io/DefaultFrameWriter.java (modified) (2 diffs)
• io/HTMLWriter.java (modified) (1 diff)
• io/PNGWriter.java (modified) (1 diff)
• settings/folders/FolderSettings.java (modified) (1 diff)
• stats/Logger.java (modified) (2 diffs)
• stats/StatsLogger.java (modified) (3 diffs)

trunk/src/org/expeditee/actions/IDE.java

@@ -44 +44 @@
                         wt.run();
                         try {
-                                String class_output_dirname = FrameIO.EXPORTS_DIR + "expeditee/bin";
+                                String class_output_dirname = FrameIO.EXPORTS_PATH + "expeditee/bin";
                                 File class_output_dir = new File(class_output_dirname);
                                 
@@ -51 +51 @@
                                 }
                                 
-                                String javac_cmd_args[] = new String[] { "javac", "-d", class_output_dirname, FrameIO.EXPORTS_DIR + fileName };
+                                String javac_cmd_args[] = new String[] { "javac", "-d", class_output_dirname, FrameIO.EXPORTS_PATH + fileName };
                                 
                                 Process p = Runtime.getRuntime().exec(javac_cmd_args,null);
@@ -102 +102 @@
                 String className = getClassName(source);
                 try {
-                        String class_dirname = FrameIO.EXPORTS_DIR + "expeditee/bin";
+                        String class_dirname = FrameIO.EXPORTS_PATH + "expeditee/bin";
                         String java_cmd_args[] = new String[] { "java", "-cp", class_dirname, className };
 

trunk/src/org/expeditee/actions/Misc.java

@@ -659 +659 @@
                 // if the frame was loaded successfully
                 if (loaded != null) {
-                        String path = FrameIO.EXPORTS_DIR;
+                        String path = FrameIO.EXPORTS_PATH;
                         String frameName = ImageFrame(loaded, format, path);
                         if (frameName != null)

trunk/src/org/expeditee/gui/FrameIO.java

@@ -93 +93 @@
         // The parent path that all others are relative to.  Also referred to as Expeditee Home.
         public static String PARENT_FOLDER;
-        
-        // The below paths are categorised based on their use in the new/old regime.  See UserSettings.appendDefaultFolders for more inforamtion.
-        // Paths used by Both the new regime (multiuser mode) and the old regime.
+
         public static String PROFILE_PATH;
         public static String FRAME_PATH;
-        public static String MESSAGES_PATH;
         public static String IMAGES_PATH;
         public static String AUDIO_PATH;
         public static String PUBLIC_PATH;
         public static String TRASH_PATH;
-        
-        // Paths used by both the new regime and the old regime, that points to different locations based on regime setting.
         public static String FONT_PATH;
         public static String DICT_PATH;
-        public static String EXPORTS_DIR;
-        public static String STATISTICS_DIR;
-        public static String LOGS_DIR;
-        
-        // Paths used only by new regime.
+        public static String EXPORTS_PATH;
+        public static String STATISTICS_PATH;
+        public static String LOGS_PATH;
+        public static String MESSAGES_PATH;
+        public static String MAIL_PATH;
         public static String SHARED_FRAMESETS_PATH;
         public static String CONTACTS_PATH;
-        public static String RESOURCES_PRIVATE;
+        public static String RESOURCES_PRIVATE_PATH;
         public static String RESOURCES_PATH;
         public static String FRAME_PRIVATE_PATH;
@@ -120 +115 @@
         public static String AUDIO_PRIVATE_PATH;
         public static String HELP_PRIVATE_PATH;
-        
-        // Paths used only by old regime.
         public static String HELP_PATH;
-        
+
         // Paths that appear to be unused.
         public static String TEMPLATES_PATH;
@@ -139 +132 @@
         public static void changeParentAndSubFolders(String newFolder) {
                 // Partial Paths.
-                PARENT_FOLDER = newFolder;
-                        
+                PARENT_FOLDER = newFolder;      
                 String resourcesPublicPath = PARENT_FOLDER + "resources-public" + File.separator;
+                String resourcesPrivateIndividualPath = PARENT_FOLDER + "resources-" + UserSettings.UserName.get() + File.separator;
 
                 // Standard paths.
                 PUBLIC_PATH = PARENT_FOLDER + "public" + File.separator;
-                MESSAGES_PATH = PARENT_FOLDER + "messages" + File.separator;
                 TRASH_PATH = PARENT_FOLDER + "trash" + File.separator;
+                //MESSAGES_PATH = PARENT_FOLDER + "messages" + File.separator;
                 HELP_PATH = PARENT_FOLDER + "documentation" + File.separator;
                 PROFILE_PATH = PARENT_FOLDER + "profiles" + File.separator;
-                EXPORTS_DIR = PARENT_FOLDER + "exports" + File.separator;
-                STATISTICS_DIR = PARENT_FOLDER + "statistics" + File.separator;
-                LOGS_DIR = PARENT_FOLDER + "logs" + File.separator;
+                EXPORTS_PATH = PARENT_FOLDER + "exports" + File.separator;
+                STATISTICS_PATH = PARENT_FOLDER + "statistics" + File.separator;
+                LOGS_PATH = PARENT_FOLDER + "logs" + File.separator;
                                 
                 
@@ -181 +174 @@
                         RESOURCES_PATH = null;
                         SHARED_FRAMESETS_PATH = null;
-                        RESOURCES_PRIVATE = null;               
+                        RESOURCES_PRIVATE_PATH = null;          
                         FRAME_PRIVATE_PATH = null;
                         IMAGES_PRIVATE_PATH = null;
                         AUDIO_PRIVATE_PATH = null;
                         CONTACTS_PATH = null;
+                        HELP_PRIVATE_PATH = null;
+                        
+                        if (!UserSettings.PublicAndPrivateResources) {
+                                MESSAGES_PATH = PARENT_FOLDER + "messages" + File.separator;
+                        } else {
+                                MESSAGES_PATH = resourcesPrivateIndividualPath + "messages" + File.separator;
+                        }
+                        
                 } else {
-                        String resourcesPrivateIndividualPath = PARENT_FOLDER + "resources-" + UserSettings.UserName.get() + File.separator;
-                        
                         RESOURCES_PATH = resourcesPublicPath + "documentation" + File.separator;
                         SHARED_FRAMESETS_PATH = resourcesPrivateIndividualPath + "framesets-shared" + File.separator;
                         
-                        RESOURCES_PRIVATE = PARENT_FOLDER + "resources-private" + File.separator;
+                        RESOURCES_PRIVATE_PATH = PARENT_FOLDER + "resources-private" + File.separator;
                         FRAME_PRIVATE_PATH = resourcesPrivateIndividualPath + "framesets" + File.separator;
                         IMAGES_PRIVATE_PATH = resourcesPrivateIndividualPath + "images" + File.separator;
@@ -198 +197 @@
                         CONTACTS_PATH = resourcesPrivateIndividualPath + "contacts" + File.separator;
                         HELP_PRIVATE_PATH = resourcesPrivateIndividualPath + "documentation" + File.separator;
+                        MESSAGES_PATH = resourcesPrivateIndividualPath + "messages" + File.separator;
+                        MAIL_PATH = resourcesPrivateIndividualPath + "mail" + File.separator;
                 } 
                         
@@ -1928 +1929 @@
                 Path personalResources = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-" + username);
                 personalResources.toFile().mkdir();             
-                File[] globalResourcesToCopy = Paths.get(FrameIO.RESOURCES_PRIVATE).toFile().listFiles();
+                File[] globalResourcesToCopy = Paths.get(FrameIO.RESOURCES_PRIVATE_PATH).toFile().listFiles();
                 
                 try {

trunk/src/org/expeditee/io/AbstractHTMLWriter.java

@@ -44 +44 @@
 
                 // Clear the filesFolder
-                String filesFolderName = FrameIO.EXPORTS_DIR + getFilesFolder();
+                String filesFolderName = FrameIO.EXPORTS_PATH + getFilesFolder();
                 if (filesFolderName.length() > 0) {
                         File filesFolder = new File(filesFolderName);

trunk/src/org/expeditee/io/DefaultFrameWriter.java

@@ -209 +209 @@
         protected void initialise(Frame start, Writer writer) throws IOException {
                 if (_filename == null)
-                        _filename = FrameIO.EXPORTS_DIR + getFileName(start) + _format;
+                        _filename = FrameIO.EXPORTS_PATH + getFileName(start) + _format;
 
                 if (writer != null) {
@@ -227 +227 @@
 
                         if (!_filename.contains(File.separator))
-                                _filename = FrameIO.EXPORTS_DIR + _filename;
+                                _filename = FrameIO.EXPORTS_PATH + _filename;
 
                         File test = new File(_filename);

trunk/src/org/expeditee/io/HTMLWriter.java

@@ -91 +91 @@
                         // Account for the possibility of an unlinked buffered image
                         fileName = link == null ? ("Image" + pic.getID()) : link;
-                        fileName = Misc.SaveImage(image, "PNG", FrameIO.EXPORTS_DIR + filesFolder, fileName);
+                        fileName = Misc.SaveImage(image, "PNG", FrameIO.EXPORTS_PATH + filesFolder, fileName);
                 } else {// It is a normal Image stored somewhere
                         fileName = pic.getName();
 
                         String oldImageName = FrameIO.IMAGES_PATH + fileName;
-                        String newImageName = FrameIO.EXPORTS_DIR + filesFolder + fileName;
+                        String newImageName = FrameIO.EXPORTS_PATH + filesFolder + fileName;
                         try {
                                 FrameIO.copyFile(oldImageName, newImageName);

trunk/src/org/expeditee/io/PNGWriter.java

@@ -36 +36 @@
                 indent();
                 String filesFolder = getFilesFolder();
-                String imageDirectory = FrameIO.EXPORTS_DIR + filesFolder;
+                String imageDirectory = FrameIO.EXPORTS_PATH + filesFolder;
                 String fileName = Misc.ImageFrame(starting, "PNG", imageDirectory);
                 if (fileName != null) {

trunk/src/org/expeditee/settings/folders/FolderSettings.java

@@ -116 +116 @@
                 AttributeValuePair avp = new AttributeValuePair(text.getText());
                 if(avp.getValue().trim().length() != 0) {
-                        FrameIO.LOGS_DIR = FrameUtils.getDir(avp.getValue());
+                        FrameIO.LOGS_PATH = FrameUtils.getDir(avp.getValue());
                 }
                 return true;

trunk/src/org/expeditee/stats/Logger.java

@@ -99 +99 @@
                         return;
 
-                File test = new File(org.expeditee.gui.FrameIO.LOGS_DIR);
+                File test = new File(org.expeditee.gui.FrameIO.LOGS_PATH);
                 if (!test.exists())
                         test.mkdir();
@@ -175 +175 @@
                 try {
                         BufferedWriter writer = new BufferedWriter(new FileWriter(
-                                        org.expeditee.gui.FrameIO.LOGS_DIR + _filename, true));
+                                        org.expeditee.gui.FrameIO.LOGS_PATH + _filename, true));
                         writer.write(toWrite);
                         writer.newLine();

trunk/src/org/expeditee/stats/StatsLogger.java

@@ -56 +56 @@
                         return;
 
-                File test = new File(org.expeditee.gui.FrameIO.STATISTICS_DIR);
+                File test = new File(org.expeditee.gui.FrameIO.STATISTICS_PATH);
                 if (!test.exists())
                         test.mkdir();
@@ -102 +102 @@
                 try {
                         BufferedWriter writer = new BufferedWriter(new FileWriter(
-                                        org.expeditee.gui.FrameIO.STATISTICS_DIR + _filename, true));
+                                        org.expeditee.gui.FrameIO.STATISTICS_PATH + _filename, true));
 
                         writer.write(SessionStats.getCurrentStats());
@@ -117 +117 @@
 
                         writer = new BufferedWriter(new FileWriter(
-                                        org.expeditee.gui.FrameIO.STATISTICS_DIR
+                                        org.expeditee.gui.FrameIO.STATISTICS_PATH
                                                         + FRAMES_EDITED_FILENAME, true));
                         writer.write(SessionStats.getFramesEdited());