[Obo-svn-commit] SF.net SVN: obo: [423] phenote/trunk/src/java/phenote/config

[<mg...@us...>]

Revision: 423
          http://svn.sourceforge.net/obo/?rev=423&view=rev
Author:   mgibson
Date:     2007-03-28 07:39:32 -0700 (Wed, 28 Mar 2007)

Log Message:
-----------
now brings up config picker with currently configged selected if there is a
currently configged (not so initially)

Modified Paths:
--------------
    phenote/trunk/src/java/phenote/config/Config.java
    phenote/trunk/src/java/phenote/config/ConfigFileQueryGui.java

Modified: phenote/trunk/src/java/phenote/config/Config.java
===================================================================
--- phenote/trunk/src/java/phenote/config/Config.java	2007-03-28 14:21:50 UTC (rev 422)
+++ phenote/trunk/src/java/phenote/config/Config.java	2007-03-28 14:39:32 UTC (rev 423)
@@ -49,6 +49,9 @@
   private boolean configInitialized = false;
   private final static String myphenoteFile = "my-phenote";
 
+  public static Config inst() {
+    return singleton;
+  }
   /** singleton */
   private Config() {}
 
@@ -97,8 +100,9 @@
   private String getDefaultFile() {
     String file=null;
     try {
-      LineNumberReader r = new LineNumberReader(new FileReader(getMyPhenoteFile()));
-      file = r.readLine();
+//      LineNumberReader r = new LineNumberReader(new FileReader(getMyPhenoteFile()));
+//      file = r.readLine();
+      file = getMyPhenoteConfigString();
     } catch (IOException e) {}
     if (file == null || file.equals("")) {
       //file = FLYBASE_DEFAULT_CONFIG_FILE;
@@ -106,6 +110,14 @@
     }
     return file;
   }
+
+  /** Get config file string that is in my-phenote file - throw io exception if file
+      doesnt exist. todo: should also throw ex if doesnt have a valid file in it? */
+  String getMyPhenoteConfigString() throws IOException {
+    LineNumberReader r = new LineNumberReader(new FileReader(getMyPhenoteFile()));
+    String configFile = r.readLine();
+    return configFile;
+  }
   
   private String queryUserForConfigFile() {
     return ConfigFileQueryGui.queryUserForConfigFile();
@@ -267,9 +279,6 @@
 //   }
 
 
-  public static Config inst() {
-    return singleton;
-  }
 
   // --> hasFileDataAdapters
   public boolean hasDataAdapters() {

Modified: phenote/trunk/src/java/phenote/config/ConfigFileQueryGui.java
===================================================================
--- phenote/trunk/src/java/phenote/config/ConfigFileQueryGui.java	2007-03-28 14:21:50 UTC (rev 422)
+++ phenote/trunk/src/java/phenote/config/ConfigFileQueryGui.java	2007-03-28 14:39:32 UTC (rev 423)
@@ -86,14 +86,19 @@
     JPanel buttonPanel = new JPanel();
     buttonPanel.setLayout(new BoxLayout(buttonPanel,BoxLayout.Y_AXIS));
     buttonGroup = new ButtonGroup();
-    boolean first = true;
+    boolean doFirst = false;
+    String currentConfig = null;
+    try { currentConfig = Config.inst().getMyPhenoteConfigString(); }
+    catch (IOException e) { doFirst = true; }
     for (String cfg : getConfigNames()) {
       JRadioButton b = new JRadioButton(new BtnAction(cfg));
       buttonPanel.add(b);
-      if (first) {
+      // select current myphenote if exists, else select first
+      if ( (currentConfig != null && cfg.equals(currentConfig)) 
+          || (currentConfig == null && doFirst) ) {
         b.setSelected(true);
         selectedFile = cfg;
-        first = false;
+        doFirst = false;
       }
       buttonGroup.add(b);
     }


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