git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into task/JAL-2196pdbeProperties
[jalview.git]
/
src
/
jalview
/
gui
/
SequenceFetcher.java
diff --git
a/src/jalview/gui/SequenceFetcher.java
b/src/jalview/gui/SequenceFetcher.java
index
5d4ea68
..
bbe2f68
100755
(executable)
--- a/
src/jalview/gui/SequenceFetcher.java
+++ b/
src/jalview/gui/SequenceFetcher.java
@@
-167,9
+167,8
@@
public class SequenceFetcher extends JPanel implements Runnable
if (sfetch == null
|| dasRegistry != Cache.getDasSourceRegistry()
|| lastDasSourceRegistry != (Cache.getDasSourceRegistry()
if (sfetch == null
|| dasRegistry != Cache.getDasSourceRegistry()
|| lastDasSourceRegistry != (Cache.getDasSourceRegistry()
- .getDasRegistryURL() + Cache
- .getDasSourceRegistry().getLocalSourceString())
- .hashCode())
+ .getDasRegistryURL() + Cache.getDasSourceRegistry()
+ .getLocalSourceString()).hashCode())
{
_initingFetcher = true;
initingThread = Thread.currentThread();
{
_initingFetcher = true;
initingThread = Thread.currentThread();
@@
-213,7
+212,7
@@
public class SequenceFetcher extends JPanel implements Runnable
public SequenceFetcher(IProgressIndicator guiIndic,
final String selectedDb, final String queryString)
{
public SequenceFetcher(IProgressIndicator guiIndic,
final String selectedDb, final String queryString)
{
- this._isConstructing=true;
+ this._isConstructing = true;
this.progressIndicator = guiIndic;
final SequenceFetcher us = this;
// launch initialiser thread
this.progressIndicator = guiIndic;
final SequenceFetcher us = this;
// launch initialiser thread
@@
-226,7
+225,7
@@
public class SequenceFetcher extends JPanel implements Runnable
if (getSequenceFetcherSingleton(progressIndicator) != null)
{
us.initGui(progressIndicator, selectedDb, queryString);
if (getSequenceFetcherSingleton(progressIndicator) != null)
{
us.initGui(progressIndicator, selectedDb, queryString);
- us._isConstructing=false;
+ us._isConstructing = false;
}
else
{
}
else
{
@@
-252,17
+251,23
@@
public class SequenceFetcher extends JPanel implements Runnable
});
sf.start();
}
});
sf.start();
}
+
/**
/**
- * blocking call which creates a new sequence fetcher panel, configures it and presses the OK button with the given database and query.
+ * blocking call which creates a new sequence fetcher panel, configures it and
+ * presses the OK button with the given database and query.
+ *
* @param database
* @param query
*/
public static List<AlignFrame> fetchAndShow(String database, String query)
{
* @param database
* @param query
*/
public static List<AlignFrame> fetchAndShow(String database, String query)
{
- final SequenceFetcher sf = new SequenceFetcher(Desktop.instance, database, query);
+ final SequenceFetcher sf = new SequenceFetcher(Desktop.instance,
+ database, query);
while (sf._isConstructing)
{
while (sf._isConstructing)
{
- try { Thread.sleep(50);
+ try
+ {
+ Thread.sleep(50);
} catch (Exception q)
{
return Collections.emptyList();
} catch (Exception q)
{
return Collections.emptyList();
@@
-282,7
+287,7
@@
public class SequenceFetcher extends JPanel implements Runnable
{
};
{
};
-
+
/**
* initialise the database and query for this fetcher panel
*
/**
* initialise the database and query for this fetcher panel
*
@@
-523,6
+528,7
@@
public class SequenceFetcher extends JPanel implements Runnable
new UniprotFTSPanel(this);
frame.dispose();
}
new UniprotFTSPanel(this);
frame.dispose();
}
+
private void otherSourceAction()
{
try
private void otherSourceAction()
{
try
@@
-912,8
+918,8
@@
public class SequenceFetcher extends JPanel implements Runnable
} catch (Exception e)
{
Cache.log.info(
} catch (Exception e)
{
Cache.log.info(
- "Error retrieving " + accession
- + " from " + proxy.getDbName(), e);
+ "Error retrieving " + accession + " from "
+ + proxy.getDbName(), e);
}
return success;
}
}
return success;
}
@@
-1032,8
+1038,7
@@
public class SequenceFetcher extends JPanel implements Runnable
try
{
try
{
- af.setMaximum(Cache.getDefault("SHOW_FULLSCREEN",
- false));
+ af.setMaximum(Cache.getDefault("SHOW_FULLSCREEN", false));
} catch (Exception ex)
{
}
} catch (Exception ex)
{
}