[Obo-svn-commit] SF.net SVN: obo:[2772] phenex/trunk/src/org/phenoscape/view

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

Revision: 2772
          http://obo.svn.sourceforge.net/obo/?rev=2772&view=rev
Author:   balhoff
Date:     2009-07-30 20:36:11 +0000 (Thu, 30 Jul 2009)

Log Message:
-----------
Fixed diappearing menubar after showing post-comp editor.

Modified Paths:
--------------
    phenex/trunk/src/org/phenoscape/view/PhenotypeTableComponent.java
    phenex/trunk/src/org/phenoscape/view/PostCompositionEditor.java

Modified: phenex/trunk/src/org/phenoscape/view/PhenotypeTableComponent.java
===================================================================
--- phenex/trunk/src/org/phenoscape/view/PhenotypeTableComponent.java	2009-07-24 12:58:45 UTC (rev 2771)
+++ phenex/trunk/src/org/phenoscape/view/PhenotypeTableComponent.java	2009-07-30 20:36:11 UTC (rev 2772)
@@ -24,10 +24,8 @@
 import javax.swing.table.TableCellEditor;
 
 import org.apache.log4j.Logger;
-import org.obo.datamodel.IdentifiedObject;
 import org.obo.datamodel.OBOClass;
 import org.obo.datamodel.OBOObject;
-import org.obo.util.TermUtil;
 import org.phenoscape.model.PhenexController;
 import org.phenoscape.model.Phenotype;
 import org.phenoscape.model.State;
@@ -37,7 +35,6 @@
 import org.phenoscape.swing.PopupListener;
 import org.phenoscape.util.TermSelection;
 
-import phenote.datamodel.OboUtil;
 import phenote.gui.SortDisabler;
 import phenote.gui.TableColumnPrefsSaver;
 import ca.odell.glazedlists.EventList;
@@ -174,7 +171,7 @@
         final OBOClass term = (OBOClass)(this.tableFormat.getColumnValue(phenotype, column));
         final PostCompositionEditor pce = new PostCompositionEditor(this.getController(), this.tableFormat.getColumnTermSet(column));
         pce.setTerm(term);
-        final int result = pce.runPostCompositionDialog();
+        final int result = pce.runPostCompositionDialog(this);
         if (result == JOptionPane.OK_OPTION) {
             this.tableFormat.setColumnValue(phenotype, pce.getTerm(), column);
         }

Modified: phenex/trunk/src/org/phenoscape/view/PostCompositionEditor.java
===================================================================
--- phenex/trunk/src/org/phenoscape/view/PostCompositionEditor.java	2009-07-24 12:58:45 UTC (rev 2771)
+++ phenex/trunk/src/org/phenoscape/view/PostCompositionEditor.java	2009-07-30 20:36:11 UTC (rev 2772)
@@ -1,5 +1,6 @@
 package org.phenoscape.view;
 
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -122,23 +123,14 @@
         }
     }
 
-    public int runPostCompositionDialog() {
+    public int runPostCompositionDialog(Component parentComponent) {
         if (this.genusBox == null) {
             this.init();
         }
         this.setPreferredSize(new Dimension(300, 200));
-        return JOptionPane.showConfirmDialog(null, this, "Post-composition Editor", JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
+        return JOptionPane.showConfirmDialog(parentComponent, this, "Post-composition Editor", JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
     }
 
-    private void runPostCompositionForGenus() {
-        final PostCompositionEditor pce = new PostCompositionEditor(this.getController(), this.termSet);
-        pce.setTerm(this.genus);
-        final int result = pce.runPostCompositionDialog();
-        if (result == JOptionPane.OK_OPTION) {
-            this.genusBox.setValue(pce.getTerm());
-        }
-    }
-
     private void runPostCompositionForTermAtPoint(Point p) {
         final int column = this.diffTable.getTableHeader().columnAtPoint(p);
         final int row = this.diffTable.rowAtPoint(p);
@@ -147,7 +139,7 @@
         final OBOClass term = (OBOClass)(this.tableFormat.getColumnValue(differentia, column));
         final PostCompositionEditor pce = new PostCompositionEditor(this.getController(), this.termSet);
         pce.setTerm(term);
-        final int result = pce.runPostCompositionDialog();
+        final int result = pce.runPostCompositionDialog(this);
         if (result == JOptionPane.OK_OPTION) {
             this.tableFormat.setColumnValue(differentia, pce.getTerm(), column);
         }
@@ -170,13 +162,6 @@
         this.add(this.genusBox, comboConstraints);
         final GridBagConstraints postComposeGenusConstraints = new GridBagConstraints();
         postComposeGenusConstraints.gridx = 2;
-        final JButton postComposeGenusButton = new JButton();
-        postComposeGenusButton.setAction(new AbstractAction("PC...") {
-            public void actionPerformed(ActionEvent e) {
-                runPostCompositionForGenus();
-            }
-        });
-        //this.add(postComposeGenusButton, postComposeGenusConstraints);
         this.tableFormat = new DifferentiaTableFormat();
         final EventTableModel<Differentium> model = new EventTableModel<Differentium>(this.diffs, this.tableFormat);
         this.diffTable = new BugWorkaroundTable(model);


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