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 bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
[jalview.git]
/
src
/
jalview
/
gui
/
WsJobParameters.java
diff --git
a/src/jalview/gui/WsJobParameters.java
b/src/jalview/gui/WsJobParameters.java
index
196eb32
..
b80c23e
100644
(file)
--- a/
src/jalview/gui/WsJobParameters.java
+++ b/
src/jalview/gui/WsJobParameters.java
@@
-642,8
+642,9
@@
public class WsJobParameters extends JPanel implements ItemListener,
}
else
{
}
else
{
- jalview.bin.Console.errPrintln("Ignoring unknown service argument type "
- + myarg.getClass().getName());
+ jalview.bin.Console
+ .errPrintln("Ignoring unknown service argument type "
+ + myarg.getClass().getName());
}
}
}
}
}
}
@@
-976,7
+977,8
@@
public class WsJobParameters extends JPanel implements ItemListener,
disc.run();
} catch (Exception e)
{
disc.run();
} catch (Exception e)
{
- jalview.bin.Console.errPrintln("Aborting. Problem discovering services.");
+ jalview.bin.Console
+ .errPrintln("Aborting. Problem discovering services.");
e.printStackTrace();
return;
}
e.printStackTrace();
return;
}
@@
-1034,11
+1036,13
@@
public class WsJobParameters extends JPanel implements ItemListener,
Option cpy = jalview.ws.jws2.ParameterUtils.copyOption(o);
} catch (Exception e)
{
Option cpy = jalview.ws.jws2.ParameterUtils.copyOption(o);
} catch (Exception e)
{
- jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
+ jalview.bin.Console
+ .errPrintln("Failed to copy " + o.getName());
e.printStackTrace();
} catch (Error e)
{
e.printStackTrace();
} catch (Error e)
{
- jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
+ jalview.bin.Console
+ .errPrintln("Failed to copy " + o.getName());
e.printStackTrace();
}
}
e.printStackTrace();
}
}
@@
-1055,11
+1059,13
@@
public class WsJobParameters extends JPanel implements ItemListener,
.copyParameter(o);
} catch (Exception e)
{
.copyParameter(o);
} catch (Exception e)
{
- jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
+ jalview.bin.Console
+ .errPrintln("Failed to copy " + o.getName());
e.printStackTrace();
} catch (Error e)
{
e.printStackTrace();
} catch (Error e)
{
- jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
+ jalview.bin.Console
+ .errPrintln("Failed to copy " + o.getName());
e.printStackTrace();
}
}
e.printStackTrace();
}
}
@@
-1325,7
+1331,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
*/
protected void updateWebServiceMenus()
{
*/
protected void updateWebServiceMenus()
{
- for (AlignFrame alignFrame : Desktop.getAlignFrames())
+ for (AlignFrame alignFrame : Desktop.getDesktopAlignFrames())
{
alignFrame.BuildWebServiceMenu();
}
{
alignFrame.BuildWebServiceMenu();
}
@@
-1467,8
+1473,8
@@
public class WsJobParameters extends JPanel implements ItemListener,
return;
}
curSetName = newname;
return;
}
curSetName = newname;
- jalview.bin.Console.errPrintln("New name for user setting " + curSetName
- + " (was " + setName.getSelectedItem() + ")");
+ jalview.bin.Console.errPrintln("New name for user setting "
+ + curSetName + " (was " + setName.getSelectedItem() + ")");
if (curSetName.equals(setName.getSelectedItem()))
{
curSetName = null;
if (curSetName.equals(setName.getSelectedItem()))
{
curSetName = null;