Changeset 10007

Timestamp:

2005-06-03T14:40:55+12:00 (19 years ago)

Author:

mdewsnip

Message:

Moved Utility.formatPath into FileQueue, as part of tidying up the Utility class.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• file/FileQueue.java (modified) (3 diffs)
• util/Utility.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -156 +156 @@
     cancel_action = true;
     }
+
+
+    /** Format the given filename path string so that it is no longer than the given width. If it is wider replace starting directories with ...
+     * @param key The key <strong>String</Strong> used to retrieve a phrase from the dictionary for this item.
+     * @param raw The raw filename path <strong>String</strong>.
+     * @param width The maximum width as an <i>int</i>.
+     * @return A path <strong>String</strong> no longer than width.
+     */
+    private String formatPath(String key, String raw, int width)
+    {
+    JLabel label = new JLabel(Dictionary.get(key, raw));
+    int position = -1;
+    while(label.getPreferredSize().width > width && (position = raw.indexOf(File.separator)) != -1) {
+        raw = "..." + raw.substring(position + 1);
+        label.setText(Dictionary.get(key, raw));
+    }
+    if(raw.indexOf(File.separator) == -1 && raw.startsWith("...")) {
+        raw = raw.substring(3);
+    }
+    return raw;
+    }
+
+
     /** Access to the file state label. */
     public JLabel getFileStatus() {
@@ -285 +308 @@
                 args[0] = "" + (queue.size() + 1) + "";
                 if(job.type == FileJob.COPY) {
-                    args[0] = Utility.formatPath("FileActions.Copying", source_file.getAbsolutePath(), file_status.getSize().width);
+                    args[0] = formatPath("FileActions.Copying", source_file.getAbsolutePath(), file_status.getSize().width);
                     file_status.setText(Dictionary.get("FileActions.Copying", args));
                 }
                 else {
-                    args[0] = Utility.formatPath("FileActions.Moving", source_file.getAbsolutePath(), file_status.getSize().width);
+                    args[0] = formatPath("FileActions.Moving", source_file.getAbsolutePath(), file_status.getSize().width);
                     file_status.setText(Dictionary.get("FileActions.Moving", args));
                 }
@@ -443 +466 @@
                 // Update status area
                 String args[] = new String[1];
-                args[0] = Utility.formatPath("FileActions.Deleting", source_file.getAbsolutePath(), file_status.getSize().width);
+                args[0] = formatPath("FileActions.Deleting", source_file.getAbsolutePath(), file_status.getSize().width);
                 file_status.setText(Dictionary.get("FileActions.Deleting", args));
 

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -333 +333 @@
     return result;
     }
-    /** Format the given filename path string so that it is no longer than the given width. If it is wider replace starting directories with ...
-     * @param key The key <strong>String</Strong> used to retrieve a phrase from the dictionary for this item.
-     * @param raw The raw filename path <strong>String</strong>.
-     * @param width The maximum width as an <i>int</i>.
-     * @return A path <strong>String</strong> no longer than width.
-     */
-    static public String formatPath(String key, String raw, int width) {
-    JLabel label = new JLabel(Dictionary.get(key, raw));
-    int position = -1;
-    while(label.getPreferredSize().width > width && (position = raw.indexOf(File.separator)) != -1) {
-        raw = "..." + raw.substring(position + 1);
-        label.setText(Dictionary.get(key, raw));
-    }
-    if(raw.indexOf(File.separator) == -1 && raw.startsWith("...")) {
-        raw = raw.substring(3);
-    }
-    return raw;
-    }