From 4266cb41bf11ee3fdac840e25a8159f6796276a3 Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Thu, 22 Dec 2005 16:01:52 +0000 Subject: [PATCH] Jar file 20% smaller --- src/MCview/AppletPDBCanvas.java | 2 +- src/MCview/AppletPDBViewer.java | 191 ++++++++++++++------------------------- src/MCview/Zsort.java | 4 +- 3 files changed, 73 insertions(+), 124 deletions(-) diff --git a/src/MCview/AppletPDBCanvas.java b/src/MCview/AppletPDBCanvas.java index d91d43e..b2b2c61 100755 --- a/src/MCview/AppletPDBCanvas.java +++ b/src/MCview/AppletPDBCanvas.java @@ -118,7 +118,7 @@ public class AppletPDBCanvas extends Panel implements MouseListener, MouseMotion ((PDBChain) pdb.chains.elementAt(i)).sequence, "pep"); as.calcScoreMatrix(); as.traceAlignment(); - PrintStream ps = new PrintStream(System.out) + PrintStream ps = new PrintStream(System.out) { public void print(String x) { mappingDetails.append(x); diff --git a/src/MCview/AppletPDBViewer.java b/src/MCview/AppletPDBViewer.java index 2c0080e..e80178a 100755 --- a/src/MCview/AppletPDBViewer.java +++ b/src/MCview/AppletPDBViewer.java @@ -28,18 +28,13 @@ import java.awt.event.ActionListener; import java.awt.event.ActionEvent; -public class AppletPDBViewer extends Frame +public class AppletPDBViewer extends Frame implements ActionListener, ItemListener { - PDBEntry pdb; - Sequence sequence; AppletPDBCanvas pdbcanvas; - - public AppletPDBViewer(String pdbtext,String type, Sequence seq, SeqCanvas seqcanvas) { - sequence = seq; try { @@ -54,7 +49,7 @@ public class AppletPDBViewer extends Frame add(pdbcanvas, BorderLayout.CENTER); - StringBuffer title = new StringBuffer(sequence.getName() + ":"); + StringBuffer title = new StringBuffer(seq.getName() + ":"); jalview.bin.JalviewLite.addFrame(this,title.toString(),400, 400); @@ -68,144 +63,98 @@ public class AppletPDBViewer extends Frame } } + public void actionPerformed(ActionEvent evt) + { + if(evt.getSource()==mapping) + mapping_actionPerformed(); + else if(evt.getSource()==wire) + wire_actionPerformed(); + else if(evt.getSource()==depth) + depth_actionPerformed(); + else if(evt.getSource()==zbuffer) + zbuffer_actionPerformed(); + else if(evt.getSource()==charge) + charge_actionPerformed(); + + else if(evt.getSource()==chain) + chain_actionPerformed(); + else if(evt.getSource()==seqButton) + seqButton_actionPerformed(); + else if(evt.getSource()==zappo) + pdbcanvas.setColours(new ZappoColourScheme()); + else if(evt.getSource()==taylor) + pdbcanvas.setColours(new TaylorColourScheme()); + else if(evt.getSource()==hydro) + pdbcanvas.setColours(new HydrophobicColourScheme()); + else if(evt.getSource()==helix) + pdbcanvas.setColours(new HelixColourScheme()); + else if(evt.getSource()==strand) + pdbcanvas.setColours(new StrandColourScheme()); + else if(evt.getSource()==turn) + pdbcanvas.setColours(new TurnColourScheme()); + else if(evt.getSource()==buried) + pdbcanvas.setColours(new BuriedColourScheme()); + else if(evt.getSource()==user) + { + pdbcanvas.bysequence = false; + new jalview.appletgui.UserDefinedColours(pdbcanvas); + } + } + + public void itemStateChanged(ItemEvent evt) + { + if (evt.getSource() == allchains) + allchains_itemStateChanged(); + else if (evt.getSource() == wire) + wire_actionPerformed(); + else if (evt.getSource() == depth) + depth_actionPerformed(); + else if (evt.getSource() == zbuffer) + zbuffer_actionPerformed(); + } + private void jbInit() throws Exception { - this.setMenuBar(jMenuBar1); + setMenuBar(jMenuBar1); fileMenu.setLabel("File"); coloursMenu.setLabel("Colours"); mapping.setLabel("View Mapping"); - mapping.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - mapping_actionPerformed(); - } - }); + mapping.addActionListener(this); wire.setLabel("Wireframe"); - wire.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent e) - { - wire_actionPerformed(); - } - }); + wire.addItemListener(this); depth.setState(true); depth.setLabel("Depthcue"); - depth.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent e) - { - depth_actionPerformed(); - } - }); + depth.addItemListener(this); zbuffer.setState(true); zbuffer.setLabel("Z Buffering"); - zbuffer.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent e) - { - zbuffer_actionPerformed(); - } - }); + zbuffer.addItemListener(this); charge.setLabel("Charge & Cysteine"); - charge.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - charge_actionPerformed(); - } - }); + charge.addActionListener(this); hydro.setLabel("Hydrophobicity"); - hydro.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - pdbcanvas.setColours(new HydrophobicColourScheme()); - } - }); + hydro.addActionListener(this); chain.setLabel("By Chain"); - chain.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - chain_actionPerformed(); - } - }); + chain.addActionListener(this); seqButton.setLabel("By Sequence"); - seqButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e){ - seqButton_actionPerformed(); - } - }); + seqButton.addActionListener(this); allchains.setLabel("All Chains Visible"); - allchains.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent itemEvent) - { - allchains_itemStateChanged(itemEvent); - } - }); + allchains.addItemListener(this); viewMenu.setLabel("View"); zappo.setLabel("Zappo"); - zappo.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - pdbcanvas.setColours(new ZappoColourScheme()); - } - }); + zappo.addActionListener(this); taylor.setLabel("Taylor"); - taylor.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - pdbcanvas.setColours(new TaylorColourScheme()); - } - }); + taylor.addActionListener(this); helix.setLabel("Helix Propensity"); - helix.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - pdbcanvas.setColours(new HelixColourScheme()); - } - }); + helix.addActionListener(this); strand.setLabel("Strand Propensity"); - strand.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - pdbcanvas.setColours(new StrandColourScheme()); - } - }); + strand.addActionListener(this); turn.setLabel("Turn Propensity"); - turn.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - pdbcanvas.setColours(new TurnColourScheme()); - } - }); + turn.addActionListener(this); buried.setLabel("Buried Index"); - buried.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - pdbcanvas.setColours(new BuriedColourScheme()); - } - }); + buried.addActionListener(this); user.setLabel("User Defined..."); - user.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - pdbcanvas.bysequence = false; - new jalview.appletgui.UserDefinedColours(pdbcanvas); - } - }); + user.addActionListener(this); jMenuBar1.add(fileMenu); jMenuBar1.add(coloursMenu); jMenuBar1.add(viewMenu); @@ -308,7 +257,7 @@ public class AppletPDBViewer extends Frame cap.setText(pdbcanvas.mappingDetails.toString()); } - public void allchains_itemStateChanged(ItemEvent itemEvent) + public void allchains_itemStateChanged() { pdbcanvas.setAllchainsVisible(allchains.getState()); } diff --git a/src/MCview/Zsort.java b/src/MCview/Zsort.java index 322fd2a..1e7ac41 100755 --- a/src/MCview/Zsort.java +++ b/src/MCview/Zsort.java @@ -40,7 +40,7 @@ public class Zsort { float x = ((Bond) bonds.elementAt(p)).start[2]; int i = p - 1; int j = r + 1; - + Bond tmp; while (true) { do { j = j - 1; @@ -52,7 +52,7 @@ public class Zsort { (((Bond) bonds.elementAt(i)).start[2] < x)); if (i < j) { - Bond tmp = (Bond) bonds.elementAt(i); + tmp = (Bond) bonds.elementAt(i); bonds.setElementAt(bonds.elementAt(j), i); bonds.setElementAt(tmp, j); } else { -- 1.7.10.2