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
JAL-1645 source formatting and organise imports
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
dm
/
AAConSettings.java
diff --git
a/src/jalview/ws/jws2/dm/AAConSettings.java
b/src/jalview/ws/jws2/dm/AAConSettings.java
index
8ce4639
..
5f068b0
100644
(file)
--- a/
src/jalview/ws/jws2/dm/AAConSettings.java
+++ b/
src/jalview/ws/jws2/dm/AAConSettings.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-20,12
+20,7
@@
*/
package jalview.ws.jws2.dm;
*/
package jalview.ws.jws2.dm;
-import java.util.ArrayList;
-import java.util.List;
-
-import compbio.metadata.Argument;
-import compbio.metadata.Option;
-
+import jalview.util.MessageManager;
import jalview.ws.jws2.JabaParamStore;
import jalview.ws.jws2.JabaPreset;
import jalview.ws.jws2.ParameterUtils;
import jalview.ws.jws2.JabaParamStore;
import jalview.ws.jws2.JabaPreset;
import jalview.ws.jws2.ParameterUtils;
@@
-33,6
+28,12
@@
import jalview.ws.jws2.jabaws2.Jws2Instance;
import jalview.ws.params.ArgumentI;
import jalview.ws.params.WsParamSetI;
import jalview.ws.params.ArgumentI;
import jalview.ws.params.WsParamSetI;
+import java.util.ArrayList;
+import java.util.List;
+
+import compbio.metadata.Argument;
+import compbio.metadata.Option;
+
/**
* preferences for running AACon service
*
/**
* preferences for running AACon service
*
@@
-92,7
+93,9
@@
public class AAConSettings extends jalview.ws.params.AutoCalcSetting
return;
}
// Try even harder to migrate arguments.
return;
}
// Try even harder to migrate arguments.
- throw new Error(MessageManager.getString("error.parameter_migration_not_implemented_yet"));
+ throw new Error(
+ MessageManager
+ .getString("error.parameter_migration_not_implemented_yet"));
}
}
}
}
@@
-145,7
+148,6
@@
public class AAConSettings extends jalview.ws.params.AutoCalcSetting
@Override
public String[] getServiceURLs()
{
@Override
public String[] getServiceURLs()
{
- return new String[]
- { service.getUri() };
+ return new String[] { service.getUri() };
}
}
}
}