From 6add24465322b49396087a1ae6f55e427d197d7b Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 28 Nov 2014 14:46:41 +0000 Subject: [PATCH] JAL-1517 formatting --- src/jalview/gui/BlogReader.java | 2 +- src/jalview/gui/WsParamSetManager.java | 14 +++++++------- src/jalview/ws/DasSequenceFeatureFetcher.java | 6 +++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/jalview/gui/BlogReader.java b/src/jalview/gui/BlogReader.java index 0de4adf..7d4399d 100644 --- a/src/jalview/gui/BlogReader.java +++ b/src/jalview/gui/BlogReader.java @@ -25,10 +25,10 @@ import jalview.util.MessageManager; import java.awt.BorderLayout; import java.awt.Component; +import java.awt.Dialog.ModalExclusionType; import java.awt.Dimension; import java.awt.Font; import java.awt.Rectangle; -import java.awt.Dialog.ModalExclusionType; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; diff --git a/src/jalview/gui/WsParamSetManager.java b/src/jalview/gui/WsParamSetManager.java index 46d93b0..2db19a2 100644 --- a/src/jalview/gui/WsParamSetManager.java +++ b/src/jalview/gui/WsParamSetManager.java @@ -20,6 +20,13 @@ */ package jalview.gui; +import jalview.bin.Cache; +import jalview.io.JalviewFileChooser; +import jalview.util.MessageManager; +import jalview.ws.params.ParamDatastoreI; +import jalview.ws.params.ParamManager; +import jalview.ws.params.WsParamSetI; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -33,13 +40,6 @@ import java.util.StringTokenizer; import javax.swing.JOptionPane; -import jalview.bin.Cache; -import jalview.io.JalviewFileChooser; -import jalview.util.MessageManager; -import jalview.ws.params.ParamDatastoreI; -import jalview.ws.params.ParamManager; -import jalview.ws.params.WsParamSetI; - /** * store and retrieve web service parameter sets. * diff --git a/src/jalview/ws/DasSequenceFeatureFetcher.java b/src/jalview/ws/DasSequenceFeatureFetcher.java index 64181ca..a778ab1 100644 --- a/src/jalview/ws/DasSequenceFeatureFetcher.java +++ b/src/jalview/ws/DasSequenceFeatureFetcher.java @@ -626,7 +626,9 @@ public class DasSequenceFeatureFetcher Object[] nextSequence(jalviewSourceI dasSource, SequenceI seq) { if (cancelled) + { return null; + } DBRefEntry[] uprefs = jalview.util.DBRefUtils.selectRefs( seq.getDBRef(), new String[] { @@ -668,7 +670,9 @@ public class DasSequenceFeatureFetcher qstring.add(uprefs[j].getAccessionId()); } else + { System.out.println("IGNORE " + csys.getAuthority()); + } } } } @@ -839,7 +843,7 @@ public class DasSequenceFeatureFetcher { for (String note : feat.getNOTE()) { - desc += (String) note; + desc += note; } } -- 1.7.10.2