[Obo-svn-commit] SF.net SVN: obo:[1936] phenote/trunk/src/java/org/phenoscape/app

[<ba...@us...>]

Revision: 1936
          http://obo.svn.sourceforge.net/obo/?rev=1936&view=rev
Author:   balhoff
Date:     2008-07-30 16:28:11 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
More fixes for window titles.

Modified Paths:
--------------
    phenote/trunk/src/java/org/phenoscape/app/CrossPlatform.java
    phenote/trunk/src/java/org/phenoscape/app/DocumentController.java

Modified: phenote/trunk/src/java/org/phenoscape/app/CrossPlatform.java
===================================================================
--- phenote/trunk/src/java/org/phenoscape/app/CrossPlatform.java	2008-07-30 16:14:27 UTC (rev 1935)
+++ phenote/trunk/src/java/org/phenoscape/app/CrossPlatform.java	2008-07-30 16:28:11 UTC (rev 1936)
@@ -2,6 +2,8 @@
 
 import java.io.File;
 
+import javax.swing.JFrame;
+
 /**
  * A collection of static methods providing platform-specific functionality.
  * @author Jim Balhoff
@@ -37,6 +39,18 @@
     return !getCurrentPlatform().equals(Platform.MAC);
   }
   
+  public static void titleWindowForFile(JFrame window, File file, String appName) {
+    final String docName = file != null ? file.getName() : "Untitled";
+    final String windowTitle;
+    if (CrossPlatform.shouldPutAppNameInWindowTitle()) {
+      windowTitle = docName + " - " + appName;
+    } else {
+      windowTitle = docName;
+    }
+    window.setTitle(windowTitle);
+    window.getRootPane().putClientProperty("Window.documentFile", file);
+  }
+  
   public static String getDocumentWindowTitle(String docName, String appName) {
     final String docTitle = docName != null ? docName : "Untitled";
     final String windowTitle;

Modified: phenote/trunk/src/java/org/phenoscape/app/DocumentController.java
===================================================================
--- phenote/trunk/src/java/org/phenoscape/app/DocumentController.java	2008-07-30 16:14:27 UTC (rev 1935)
+++ phenote/trunk/src/java/org/phenoscape/app/DocumentController.java	2008-07-30 16:28:11 UTC (rev 1936)
@@ -69,10 +69,8 @@
   
   private void setWindowTitle(File aFile) {
     final JFrame window = this.getWindow();
-    final String docTitle = aFile != null ? aFile.getName() : null;
-    final String windowTitle = CrossPlatform.getDocumentWindowTitle(docTitle, this.getAppName());
     if (window != null) {
-      window.setTitle(windowTitle);
+      CrossPlatform.titleWindowForFile(window, aFile, this.getAppName());
     }
   }
   


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.