obo-svn-commit Mailing List for Open Biomedical Ontologies (Page 159)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 704
          http://svn.sourceforge.net/obo/?rev=704&view=rev
Author:   mgibson
Date:     2007-07-06 12:08:36 -0700 (Fri, 06 Jul 2007)

Log Message:
-----------
some improvements to config gui - still shoddy but coming along
ontology part of it better - ont name, ont file

Modified Paths:
--------------
    phenote/trunk/src/java/phenote/config/OntologyConfig.java
    phenote/trunk/src/java/phenote/gui/ConfigGui.java

Modified: phenote/trunk/src/java/phenote/config/OntologyConfig.java
===================================================================

--- phenote/trunk/src/java/phenote/config/OntologyConfig.java	2007-07-06 17:55:32 UTC (rev 703)
+++ phenote/trunk/src/java/phenote/config/OntologyConfig.java	2007-07-06 19:08:36 UTC (rev 704)
@@ -49,6 +49,12 @@
       setName("Relationship");
   }
 
+  public OntologyConfig(String name,String displayName,FieldConfig fc) {
+    fieldConfig = fc;
+    setName(name);
+    // displayname
+  }
+
   Ontology getOntologyBean() {
     // if ontologyBean == null ontologyBean = new Ontology(); ???
     if (ontologyBean == null) // this is for backward compatible to old ontol ways
@@ -79,17 +85,18 @@
 
 
   // for makePostCompRelCfg PASE - for backward compatibility
-  private OntologyConfig(String name, String file,FieldConfig fc) {
-    //this(name,fc);
-    fieldConfig = fc;
-    setName(name);
-    setOntologyFile(file);
-  }
+//   private OntologyConfig(String name, String file,FieldConfig fc) {
+//     //this(name,fc);
+//     fieldConfig = fc;
+//     setName(name);
+//     setOntologyFile(file);
+//   }
 
   // phasing out PASE - now just doing rel as another ontology - backward compatible
   // called from field config
   static OntologyConfig makePostCompRelCfg(String file,FieldConfig fc) {
-    OntologyConfig rel = new OntologyConfig("Relationship",file,fc);
+    OntologyConfig rel = new OntologyConfig("Relationship",null,fc);
+    rel.setOntologyFile(file);
     rel.setIsPostCompRel(true);
     rel.getOntologyBean().setFile(file); // crucial!
     fc.getFieldBean().unsetPostcomp(); // also crucial - get rid of it
@@ -100,7 +107,7 @@
 
   /** File can be url(repos) or filename (from cache/jar/app), if url sets 
       reposUrlString and ontologyFile with end of url */
-  private void setFile(String file) {
+  public void setFile(String file) {
     if (file == null) {
       System.out.println("ERROR: null ontology file "+getName());
       new Throwable().printStackTrace();
@@ -124,7 +131,7 @@
     return !isBad(getName());
   }
 
-  void setName(String name) {
+  public void setName(String name) {
     if (isBad(name))
       return;
     //this.name = name;

Modified: phenote/trunk/src/java/phenote/gui/ConfigGui.java
===================================================================
--- phenote/trunk/src/java/phenote/gui/ConfigGui.java	2007-07-06 17:55:32 UTC (rev 703)
+++ phenote/trunk/src/java/phenote/gui/ConfigGui.java	2007-07-06 19:08:36 UTC (rev 704)
@@ -37,6 +37,8 @@
 public class ConfigGui {
 
   private final static String NO_NAME = "No Name";
+  private final static String NO_NAME_ITAL = 
+    "<html><i><font color=gray>"+NO_NAME+"</font></i></html>";
 
   private JList configList;
   private Config currentConfig; // ???
@@ -221,7 +223,7 @@
 
     // ONTOLOGY LIST
     ListSelectionListener l = new OntologyListSelectionListener();
-    ontologyList = addList("Ontologies",g,fieldPanel,null,l);
+    ontologyList = addList("Ontologies",g,fieldPanel,new AddOntActionListener(),l);
 
     return fieldScroll;
   }
@@ -236,10 +238,10 @@
     addTitle("ONTOLOGY",g,ontolPanel);
 
     // NAME
-    ontolNameInput = addNameInput(g,ontolPanel,null);//new OntolNameDocumentListener());
+    ontolNameInput = addNameInput(g,ontolPanel,new OntNameDocumentListener());
 
     // FILE/URL
-    ontolFile = addInput(g,"File/URL",ontolPanel);
+    ontolFile = addInput(g,"File/URL",ontolPanel,new OntFileDocLis());
 
     namespace = addInput(g,"Namespace",ontolPanel);
 
@@ -254,6 +256,7 @@
   }
 
 
+
   private PhenoteListModel<Config> getConfigListModel() {
     return getPhenoteListModel(configList);
   }
@@ -261,12 +264,19 @@
   private Config getConfig(int i) {
     return getConfigListModel().get(i);
   }
+
   private FieldConfig getFieldConfig(int i) { return getFieldListModel().get(i); }
 
+  private OntologyConfig getOntConfig(int i) { return getOntListModel().get(i); }
+
   private PhenoteListModel<FieldConfig> getFieldListModel() {
     return getPhenoteListModel(fieldList);
   }
 
+  private PhenoteListModel<OntologyConfig> getOntListModel() {
+    return getPhenoteListModel(ontologyList);
+  }
+
   private PhenoteListModel getPhenoteListModel(JList l) {
     ListModel m = l.getModel();
     if (m instanceof PhenoteListModel)
@@ -296,9 +306,7 @@
         System.out.println("Error: no config selected");
         return;
       }
-      String n = NO_NAME;
-      String noNameItalics = "<html><i><font color=gray>"+n+"</font></i></html>";
-      FieldConfig fc = new FieldConfig(n,noNameItalics,getSelectedConfig()); //??
+      FieldConfig fc = new FieldConfig(NO_NAME,NO_NAME_ITAL,getSelectedConfig());
       getFieldListModel().add(fc);
       int newIndex = fieldList.getModel().getSize() - 1;
       fieldList.setSelectedIndex(newIndex);
@@ -306,6 +314,22 @@
     }
   }
 
+  private class AddOntActionListener implements ActionListener {
+    public void actionPerformed(ActionEvent e) {
+      if (!hasSelectedField()) {
+        System.out.println("Error: no field selected");
+        return;
+      }
+      OntologyConfig oc =
+        new OntologyConfig(NO_NAME,NO_NAME_ITAL,getSelectedFieldConfig()); 
+      getOntListModel().add(oc);
+      int newIndex = ontologyList.getModel().getSize() - 1;
+      ontologyList.setSelectedIndex(newIndex);
+      ontologyList.repaint();
+    }
+  }
+
+
   private class ConfigNameDocListener implements DocumentListener {
     public void changedUpdate(DocumentEvent e) { updateConfigListWithName(); }
     public void insertUpdate(DocumentEvent e) { updateConfigListWithName(); }
@@ -345,6 +369,29 @@
     fieldList.repaint();
   }
 
+  private class OntNameDocumentListener implements DocumentListener {
+    public void changedUpdate(DocumentEvent e) { updateOntListWithName(); }
+    public void insertUpdate(DocumentEvent e) { updateOntListWithName(); }
+    public void removeUpdate(DocumentEvent e) { updateOntListWithName(); }
+  }
+
+  private void updateOntListWithName() {
+    if (!userEditing) return;
+    int i = ontologyList.getSelectedIndex();
+    if (i == -1) return; // nothing selected
+    getOntConfig(i).setName(ontolNameInput.getText());
+    ontologyList.repaint();
+  }
+  private class OntFileDocLis implements DocumentListener {
+    public void changedUpdate(DocumentEvent e) { updateOntFile(); }
+    public void insertUpdate(DocumentEvent e) { updateOntFile(); }
+    public void removeUpdate(DocumentEvent e) { updateOntFile(); }
+  }
+
+  private void updateOntFile() {
+    getSelectedOntologyConfig().setFile(ontolFile.getText());
+  }
+
   private class OntologyListSelectionListener implements ListSelectionListener {
     public void valueChanged(ListSelectionEvent e) {
       if (e.getValueIsAdjusting()) return; // only need 1 event/sel
@@ -370,6 +417,10 @@
     }
   }
 
+  private boolean hasSelectedField() {
+    return getSelectedFieldConfig() != null;
+  }
+
   private FieldConfig getSelectedFieldConfig() {
     return (FieldConfig)fieldList.getSelectedValue(); // instanceof check?
   }


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




2006	Jan	Feb	Mar	Apr	May	Jun	Jul (18)	Aug (33)	Sep (30)	Oct (27)	Nov (59)	Dec (30)
2007	Jan (67)	Feb (44)	Mar (70)	Apr (73)	May (119)	Jun (31)	Jul (92)	Aug (86)	Sep (76)	Oct (152)	Nov (156)	Dec (85)
2008	Jan (111)	Feb (121)	Mar (107)	Apr (102)	May (45)	Jun (65)	Jul (62)	Aug (133)	Sep (56)	Oct (56)	Nov (17)	Dec (15)
2009	Jan (10)	Feb (5)	Mar (10)	Apr (14)	May (49)	Jun (94)	Jul (67)	Aug (23)	Sep (9)	Oct (92)	Nov (26)	Dec (51)
2010	Jan (105)	Feb (83)	Mar (52)	Apr (59)	May (68)	Jun (71)	Jul (127)	Aug (49)	Sep (91)	Oct (27)	Nov (33)	Dec (26)
2011	Jan (26)	Feb (45)	Mar (26)	Apr (28)	May (17)	Jun (15)	Jul (45)	Aug (33)	Sep (50)	Oct (22)	Nov (10)	Dec (21)
2012	Jan (33)	Feb (24)	Mar (36)	Apr (60)	May (60)	Jun (43)	Jul (114)	Aug (19)	Sep (35)	Oct (24)	Nov (64)	Dec (12)
2013	Jan (54)	Feb (58)	Mar (51)	Apr (46)	May (21)	Jun (29)	Jul (25)	Aug (25)	Sep (13)	Oct (7)	Nov (14)	Dec (27)
2014	Jan (10)	Feb (7)	Mar (16)	Apr (14)	May (19)	Jun (8)	Jul (15)	Aug (11)	Sep (5)	Oct (11)	Nov (11)	Dec (4)
2015	Jan (52)	Feb (27)	Mar (22)	Apr (17)	May (2)	Jun (2)	Jul (2)	Aug (2)	Sep (2)	Oct	Nov (2)	Dec
2016	Jan (2)	Feb	Mar	Apr (2)	May (1)	Jun (1)	Jul (3)	Aug (2)	Sep (2)	Oct (2)	Nov (2)	Dec
2017	Jan	Feb	Mar (1)	Apr (1)	May (4)	Jun	Jul	Aug (1)	Sep (1)	Oct (2)	Nov	Dec (1)
2018	Jan	Feb	Mar (4)	Apr	May (2)	Jun (2)	Jul (2)	Aug (2)	Sep (1)	Oct (2)	Nov (1)	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul (2)	Aug	Sep	Oct	Nov	Dec (3)
2020	Jan	Feb	Mar	Apr	May (2)	Jun (3)	Jul	Aug	Sep (2)	Oct	Nov	Dec

obo-svn-commit Mailing List for Open Biomedical Ontologies (Page 159)

obo-svn-commit — sends mail for all commits to svn repository