From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 31 Oct 2005 15:55:28 +0000 (+0000)
Subject: DBPrefix and JVSuffix added
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4e988b599b29712e28b5746d7594c33c67cd2f74;p=jalview.git

DBPrefix and JVSuffix added
---

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index 209f939..382fcb6 100755
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -36,7 +36,8 @@ public class AlignViewport
   int startSeq;
   int endSeq;
 
-  boolean showFullId = true;
+  boolean showDBPrefix = true;
+  boolean showJVSuffix = true;
   boolean showText = true;
   boolean showColourText = false;
   boolean showBoxes = true;
@@ -98,7 +99,7 @@ public class AlignViewport
       String param = applet.getParameter("showFullId");
       if (param != null)
       {
-        showFullId = Boolean.valueOf(param).booleanValue();
+        showJVSuffix = Boolean.valueOf(param).booleanValue();
       }
 
       param = applet.getParameter("showAnnotation");
@@ -596,14 +597,24 @@ public class AlignViewport
     return colourAppliesToAllGroups;
   }
 
-  public boolean getShowFullId()
+  public boolean getShowJVSuffix()
   {
-    return showFullId;
+    return showJVSuffix;
   }
 
-  public void setShowFullId(boolean b)
+  public void setShowJVSuffix(boolean b)
   {
-    showFullId = b;
+    showJVSuffix = b;
+  }
+
+  public boolean getShowDBPrefix()
+  {
+    return showDBPrefix;
+  }
+
+  public void setShowDBPrefix(boolean b)
+  {
+    showDBPrefix = b;
   }
 
   public boolean getShowAnnotation()
diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index 7332a1a..44370d4 100755
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -204,14 +204,7 @@ public class AlignmentPanel
     while (i < al.getHeight() && al.getSequenceAt(i) != null)
     {
       SequenceI s = al.getSequenceAt(i);
-      if (av.getShowFullId())
-      {
-        id = s.getDisplayId();
-      }
-      else
-      {
-        id = s.getName();
-      }
+      id = s.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix());
 
       if (fm.stringWidth(id) > idWidth)
       {
diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java
index d581273..7686e8a 100755
--- a/src/jalview/appletgui/IdCanvas.java
+++ b/src/jalview/appletgui/IdCanvas.java
@@ -74,11 +74,7 @@ public class IdCanvas
       gg.setColor(Color.black);
     }
 
-    String string = s.getName();
-    if (av.getShowFullId())
-    {
-      string = s.getDisplayId();
-    }
+    String string = s.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix());
 
     gg.drawString(string, 0,
                   ((i - starty) * charHeight) + ypos +
@@ -266,11 +262,9 @@ public class IdCanvas
                     av.charHeight);
 
         gg.setColor(currentTextColor);
-        String string = av.alignment.getSequenceAt(i).getName();
-        if (av.getShowFullId())
-        {
-          string = av.alignment.getSequenceAt(i).getDisplayId();
-        }
+        String string = av.alignment.getSequenceAt(i)
+            .getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix());
+
         gg.drawString(string, 0,
                       ((i - starty) * av.charHeight) +
                       av.charHeight - (av.charHeight / 5));
diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 9b1f10d..5314ade 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -93,15 +93,9 @@ public class IdCanvas extends JPanel
             gg.setColor(Color.black);
         }
 
-        String string = s.getName();
 
-        if (av.getShowFullId())
-        {
-            string = s.getDisplayId();
-        }
-
-        gg.drawString(string, 0,
-            (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));
+        gg.drawString( s.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix()),
+                      0, (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));
     }
 
     /**
@@ -290,12 +284,8 @@ public class IdCanvas extends JPanel
 
                 gg.setColor(currentTextColor);
 
-                String string = av.alignment.getSequenceAt(i).getName();
-
-                if (av.getShowFullId())
-                {
-                    string = av.alignment.getSequenceAt(i).getDisplayId();
-                }
+                String string = av.alignment.getSequenceAt(i).getDisplayId(
+                  av.getShowDBPrefix(), av.getShowJVSuffix());
 
                 gg.drawString(string, 0,
                     (((i - starty) * av.charHeight) + av.charHeight) -
diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index 9ab6419..f49878c 100755
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -27,6 +27,7 @@ import java.io.*;
 import java.net.*;
 
 import java.util.*;
+
 import java.util.jar.*;
 
 import javax.swing.*;
@@ -393,7 +394,7 @@ public class Jalview2XML
         view.setShowBoxes(av.getShowBoxes());
         view.setShowColourText(av.getColourText());
         view.setShowConservation(av.showConservation);
-        view.setShowFullId(av.getShowFullId());
+        view.setShowFullId(av.getShowJVSuffix());
         view.setShowIdentity(av.showIdentity);
         view.setShowQuality(av.showQuality);
         view.setShowSequenceFeatures(av.showSequenceFeatures);
@@ -700,8 +701,8 @@ public class Jalview2XML
         af.viewport.setConservationSelected(view.getConservationSelected());
         af.conservationMenuItem.setSelected(view.getConservationSelected());
 
-        af.viewport.setShowFullId(view.getShowFullId());
-        af.fullSeqId.setSelected(view.getShowFullId());
+        af.viewport.setShowJVSuffix(view.getShowFullId());
+        af.seqLimits.setSelected(view.getShowFullId());
 
         af.viewport.setFont(new java.awt.Font(view.getFontName(),
                 view.getFontStyle(), view.getFontSize()));
diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 078eff1..8915f6f 100755
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -79,7 +79,8 @@ public class Preferences extends GPreferences
         Desktop.addInternalFrame(frame, "Preferences", 480, 390);
         frame.setMinimumSize(new Dimension(480,390));
 
-        fullID.setSelected(      Cache.getDefault("SHOW_FULL_ID", true));
+        dbRef.setSelected(      Cache.getDefault("SHOW_DBREF", true));
+        seqLimit.setSelected(    Cache.getDefault("SHOW_JVSUFFIX", true));
         fullScreen.setSelected(  Cache.getDefault("SHOW_FULLSCREEN", false));
         annotations.setSelected( Cache.getDefault("SHOW_ANNOTATIONS", true));
 
@@ -196,7 +197,8 @@ public class Preferences extends GPreferences
     public void ok_actionPerformed(ActionEvent e)
     {
 
-      Cache.applicationProperties.setProperty("SHOW_FULL_ID", Boolean.toString(fullID.isSelected()));
+      Cache.applicationProperties.setProperty("SHOW_DBREF", Boolean.toString(dbRef.isSelected()));
+      Cache.applicationProperties.setProperty("SHOW_JVSUFFIX", Boolean.toString(seqLimit.isSelected()));
       Cache.applicationProperties.setProperty("SHOW_FULLSCREEN", Boolean.toString(fullScreen.isSelected()));
 
       Cache.applicationProperties.setProperty("SHOW_ANNOTATIONS", Boolean.toString(annotations.isSelected()));
diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index 201ff0c..257e9fa 100755
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -134,16 +134,11 @@ public class HTMLOutput
       seq = alignment.getSequenceAt(i);
       groups = alignment.findAllGroups(seq);
 
-      if (av.getShowFullId())
-      {
-        out.println("<tr><td nowrap>" + seq.getDisplayId() +
-                    "&nbsp;&nbsp;</td>");
-      }
-      else
-      {
-        out.println("<tr><td nowrap>" + seq.getName() +
+      String id = seq.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix());
+
+      out.println("<tr><td nowrap>" + id +
                     "&nbsp;&nbsp;</td>");
-      }
+
 
       for (int res = 0; res < seq.getLength(); res++)
       {
@@ -229,16 +224,11 @@ public class HTMLOutput
         seq = al.getSequenceAt(s);
         groups = al.findAllGroups(seq);
 
-        if (av.getShowFullId())
-        {
-          out.println("<td nowrap>" + seq.getDisplayId() +
-                      "&nbsp;&nbsp;</td>");
-        }
-        else
-        {
-          out.println("<td nowrap>" + seq.getName() +
+        String id = seq.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix());
+
+          out.println("<td nowrap>" + id +
                       "&nbsp;&nbsp;</td>");
-        }
+
 
         for (int res = startRes; res < endRes; res++)
         {
diff --git a/src/jalview/io/VamsasDatastore.java b/src/jalview/io/VamsasDatastore.java
index 3c79599..69213af 100755
--- a/src/jalview/io/VamsasDatastore.java
+++ b/src/jalview/io/VamsasDatastore.java
@@ -86,6 +86,30 @@ public class VamsasDatastore
               sequence.setStart(jal.getDataset().getSequenceAt(i).getStart());
               sequence.setEnd(jal.getDataset().getSequenceAt(i).getEnd());
 
+
+              if(jal.getDataset().getSequenceAt(i).getSequenceFeatures()!=null)
+              {
+                int sfSize = jal.getDataset().getSequenceAt(i).getSequenceFeatures().size();
+
+                for (int sf = 0; sf < sfSize; sf++)
+                {
+                  jalview.datamodel.SequenceFeature feature =
+                      (jalview.datamodel.SequenceFeature)
+                      jal.getDataset().getSequenceAt(i).getSequenceFeatures().elementAt(sf);
+
+                  DataSetAnnotations dsa = new DataSetAnnotations();
+                  dsa.setType(feature.getType());
+                  dsa.setBegin(feature.getBegin());
+                  dsa.setEnd(feature.getEnd());
+                  dsa.setDescription(feature.getDescription());
+                  dsa.setStatus(feature.getStatus());
+                  dsa.addProvenance(dummyProvenance());
+                  dsa.setSeqRef(sequence);
+                  dsa.setId("sf"+(time++));
+                  dataset.addDataSetAnnotations(dsa);
+                }
+              }
+
               if(jal.getDataset().getSequenceAt(i).getDBRef()!=null)
               {
                 java.util.Vector entries = jal.getDataset().getSequenceAt(i).getDBRef();
@@ -278,6 +302,23 @@ public class VamsasDatastore
                      dataset.getSequence(i).getEnd()  );
               seqs[i].setVamsasId(dataset.getSequence(i).getId());
 
+              if (dataset.getDataSetAnnotations() != null)
+              {
+                for (int dsa = 0; dsa < dataset.getDataSetAnnotationsCount(); dsa++)
+                {
+                  if (dataset.getDataSetAnnotations(dsa).getSeqRef() ==
+                      dataset.getSequence(i))
+                  {
+                    seqs[i].addSequenceFeature(new jalview.datamodel.
+                                               SequenceFeature(
+                        dataset.getDataSetAnnotations(dsa).getType(),
+                        dataset.getDataSetAnnotations(dsa).getDescription(),
+                        dataset.getDataSetAnnotations(dsa).getStatus(),
+                        dataset.getDataSetAnnotations(dsa).getBegin(),
+                        dataset.getDataSetAnnotations(dsa).getEnd()));
+                  }
+                }
+              }
               dbref = dataset.getSequence(i).getDbRef();
 
               if(dbref.length>0)
@@ -291,7 +332,6 @@ public class VamsasDatastore
                            dbref[db].getAccessionId().toString()));
                 }
               }
-
             }
             jalview.datamodel.Alignment jdataset = new jalview.datamodel.Alignment(seqs);
             ////////////////////////////////////////////////
@@ -302,6 +342,8 @@ public class VamsasDatastore
             Alignment alignment = dataset.getAlignment(0);
             iSize = alignment.getAlignmentSequenceCount();
             seqs = new jalview.datamodel.Sequence[iSize];
+            String id;
+            int j, jSize = jdataset.getHeight();
             for (i = 0; i < iSize; i++)
             {
               seqs[i] = new jalview.datamodel.Sequence(
@@ -309,6 +351,17 @@ public class VamsasDatastore
                   alignment.getAlignmentSequence(i).getSequence(),
                   alignment.getAlignmentSequence(i).getStart(),
                   alignment.getAlignmentSequence(i).getEnd());
+
+              id = ( (Sequence) alignment.getAlignmentSequence(i).getRefid()).getId();
+
+             for(j=0; j<jSize; j++)
+             {
+               if(jdataset.getSequenceAt(j).getVamsasId().equals(id))
+               {
+                 seqs[i].setDatasetSequence( jdataset.getSequenceAt(j) );
+                 break;
+               }
+             }
             }
             jalview.datamodel.Alignment jal = new jalview.datamodel.Alignment(seqs);
             jal.setDataset(jdataset);
@@ -326,7 +379,7 @@ public class VamsasDatastore
             {
               AlignmentAnnotations[] an = alignment.getAlignmentAnnotations();
 
-              for (int j = 0; j < an.length; j++)
+              for (j = 0; j < an.length; j++)
               {
                 boolean topaliBreakpoint = false;
 
diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 5a0357e..6ec19e2 100755
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -99,7 +99,7 @@ public class GAlignFrame
   public JCheckBoxMenuItem applyToAllGroups = new JCheckBoxMenuItem();
   JMenuItem createPNG = new JMenuItem();
   protected JMenuItem font = new JMenuItem();
-  public JCheckBoxMenuItem fullSeqId = new JCheckBoxMenuItem();
+  public JCheckBoxMenuItem seqLimits = new JCheckBoxMenuItem();
   JMenuItem epsFile = new JMenuItem();
   JMenuItem LoadtreeMenuItem = new JMenuItem();
   public JCheckBoxMenuItem scaleAbove = new JCheckBoxMenuItem();
@@ -117,6 +117,7 @@ public class GAlignFrame
   protected JCheckBoxMenuItem showTranslation = new JCheckBoxMenuItem();
   protected JTabbedPane tabbedPane = new JTabbedPane();
   protected JMenuItem featureSettings = new JMenuItem();
+  public JCheckBoxMenuItem seqDBRef = new JCheckBoxMenuItem();
 
   public GAlignFrame()
   {
@@ -826,13 +827,14 @@ public class GAlignFrame
         font_actionPerformed(e);
       }
     });
-    fullSeqId.setText("Show Full Sequence ID");
-    fullSeqId.setState( jalview.bin.Cache.getDefault("SHOW_FULL_ID",true));
-    fullSeqId.addActionListener(new java.awt.event.ActionListener()
+
+    seqLimits.setText("Show Sequence Limits");
+    seqLimits.setState( jalview.bin.Cache.getDefault("SHOW_JVSUFFIX",true));
+    seqLimits.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
       {
-        fullSeqId_actionPerformed(e);
+        seqLimit_actionPerformed(e);
       }
     });
     epsFile.setText("EPS");
@@ -944,6 +946,15 @@ public class GAlignFrame
         featureSettings_actionPerformed(e);
       }
     });
+    seqDBRef.setState( jalview.bin.Cache.getDefault("SHOW_DBPREFIX",true));
+    seqDBRef.setText("Show Sequence DB Refs");
+    seqDBRef.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        seqDBRef_actionPerformed(e);
+      }
+    });
     alignFrameMenuBar.add(fileMenu);
     alignFrameMenuBar.add(editMenu);
     alignFrameMenuBar.add(searchMenu);
@@ -983,7 +994,8 @@ public class GAlignFrame
     viewMenu.add(font);
     viewMenu.addSeparator();
     viewMenu.add(wrapMenuItem);
-    viewMenu.add(fullSeqId);
+    viewMenu.add(seqDBRef);
+    viewMenu.add(seqLimits);
     viewMenu.add(scaleAbove);
     viewMenu.add(scaleLeft);
     viewMenu.add(scaleRight);
@@ -1270,10 +1282,16 @@ public class GAlignFrame
   {
   }
 
-  protected void fullSeqId_actionPerformed(ActionEvent e)
+  protected void seqLimit_actionPerformed(ActionEvent e)
   {
   }
 
+  public void seqDBRef_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+
   public void createEPS(java.io.File f)
   {
   }
@@ -1354,4 +1372,5 @@ public class GAlignFrame
   {
 
   }
+
 }
diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 1896e06..106f400 100755
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -42,7 +42,7 @@ public class GPreferences extends JPanel
     BorderLayout borderLayout1 = new BorderLayout();
     protected JCheckBox quality = new JCheckBox();
     JPanel visualTab = new JPanel();
-    protected JCheckBox fullID = new JCheckBox();
+    protected JCheckBox dbRef = new JCheckBox();
     protected JCheckBox fullScreen = new JCheckBox();
     protected JCheckBox conservation = new JCheckBox();
     protected JCheckBox identity = new JCheckBox();
@@ -113,6 +113,7 @@ public class GPreferences extends JPanel
   JPanel jPanel11 = new JPanel();
   GridLayout gridLayout3 = new GridLayout();
   Font verdana11 = new java.awt.Font("Verdana", Font.PLAIN, 11);
+  protected JCheckBox seqLimit = new JCheckBox();
   /**
      * Creates a new GPreferences object.
      */
@@ -160,11 +161,11 @@ public class GPreferences extends JPanel
         quality.setText("Quality");
     visualTab.setBorder(new TitledBorder("Open new alignment"));
     visualTab.setLayout(null);
-        fullID.setFont(verdana11);
-        fullID.setHorizontalAlignment(SwingConstants.RIGHT);
-        fullID.setHorizontalTextPosition(SwingConstants.LEFT);
-    fullID.setMargin(new Insets(4, 2, 2, 0));
-    fullID.setText("Full Sequence ID");
+    dbRef.setFont(verdana11);
+    dbRef.setHorizontalAlignment(SwingConstants.RIGHT);
+    dbRef.setHorizontalTextPosition(SwingConstants.LEFT);
+    dbRef.setMargin(new Insets(4, 2, 2, 0));
+    dbRef.setText("DB refs (Uniprot|H456)");
     fullScreen.setFont(verdana11);
         fullScreen.setHorizontalAlignment(SwingConstants.RIGHT);
         fullScreen.setHorizontalTextPosition(SwingConstants.LEFT);
@@ -199,7 +200,7 @@ public class GPreferences extends JPanel
         gapLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         gapLabel.setText("Gap Symbol ");
     colour.setFont(verdana11);
-        colour.setBounds(new Rectangle(148, 171, 154, 21));
+        colour.setBounds(new Rectangle(173, 169, 154, 21));
         colourLabel.setFont(verdana11);
         colourLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         colourLabel.setText("Colour ");
@@ -211,16 +212,16 @@ public class GPreferences extends JPanel
         fontStyleCB.setFont(verdana11);
         fontStyleCB.setBounds(new Rectangle(365, 111, 70, 21));
         fontNameCB.setFont(verdana11);
-        fontNameCB.setBounds(new Rectangle(148, 111, 169, 21));
+        fontNameCB.setBounds(new Rectangle(169, 111, 148, 21));
         gapSymbolCB.setFont(verdana11);
-        gapSymbolCB.setBounds(new Rectangle(148, 141, 67, 21));
+        gapSymbolCB.setBounds(new Rectangle(171, 136, 67, 21));
         startupCheckbox.setText("Open file");
     startupCheckbox.setFont(verdana11);
         startupCheckbox.setHorizontalAlignment(SwingConstants.RIGHT);
         startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT);
         startupCheckbox.setSelected(true);
         startupFileTextfield.setFont(verdana11);
-        startupFileTextfield.setBounds(new Rectangle(148, 232, 302, 20));
+        startupFileTextfield.setBounds(new Rectangle(170, 232, 271, 20));
         startupFileTextfield.addMouseListener(new MouseAdapter()
             {
                 public void mouseClicked(MouseEvent e)
@@ -318,11 +319,11 @@ public class GPreferences extends JPanel
     jPanel1.setBorder(titledBorder1);
     jPanel1.setLayout(gridBagLayout1);
     sortby.setFont(verdana11);
-    sortby.setBounds(new Rectangle(148, 200, 302, 21));
+    sortby.setBounds(new Rectangle(171, 200, 272, 21));
     sortLabel.setFont(verdana11);
     sortLabel.setHorizontalAlignment(SwingConstants.RIGHT);
     sortLabel.setText("Sort by ");
-    jPanel2.setBounds(new Rectangle(7, 17, 138, 242));
+    jPanel2.setBounds(new Rectangle(7, 17, 158, 242));
     jPanel2.setLayout(gridLayout2);
     gridLayout2.setRows(8);
     jPanel3.setBounds(new Rectangle(147, 46, 274, 26));
@@ -396,27 +397,31 @@ public class GPreferences extends JPanel
     pileupjv.setHorizontalAlignment(SwingConstants.CENTER);
     pirjv.setFont(verdana11);
     pirjv.setHorizontalAlignment(SwingConstants.CENTER);
+    seqLimit.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    seqLimit.setHorizontalTextPosition(SwingConstants.LEADING);
+    seqLimit.setText("Sequence Limits (/1-350)");
+    seqLimit.setBounds(new Rectangle(183, 81, 178, 23));
     jPanel2.add(fullScreen);
     jPanel2.add(annotations);
-    jPanel2.add(fullID);
+    jPanel2.add(dbRef);
     jPanel2.add(fontLabel);
     jPanel2.add(gapLabel);
     jPanel2.add(colourLabel);
     jPanel2.add(sortLabel);
     jPanel2.add(startupCheckbox);
+    visualTab.add(gapSymbolCB);
+    visualTab.add(colour);
+    visualTab.add(seqLimit);
     visualTab.add(jPanel3);
     jPanel3.add(conservation);
     jPanel3.add(quality);
     jPanel3.add(identity);
     visualTab.add(sortby);
-    visualTab.add(colour);
     visualTab.add(startupFileTextfield);
     visualTab.add(fontNameCB);
     visualTab.add(fontSizeCB);
     visualTab.add(fontStyleCB);
-    visualTab.add(gapSymbolCB);
     visualTab.add(jPanel2);
-
     linkPanel.add(editLinkButtons, BorderLayout.EAST);
     editLinkButtons.add(newLink, null);
     editLinkButtons.add(editLink, null);
@@ -468,7 +473,7 @@ public class GPreferences extends JPanel
 
     tabbedPane.add(visualTab, "Visual");
     tabbedPane.add(connectTab,"Connections");
-    tabbedPane.add(exportTab, "File");
+    tabbedPane.add(exportTab, "Output");
     jPanel11.add(jLabel2);
     jPanel11.add(jLabel1);
     jPanel11.add(jLabel10);