-/*******************************************************************************
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
- *
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
+ *
* This file is part of Jalview.
- *
+ *
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see <http://www.gnu.org/licenses/>.
- *******************************************************************************/
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
/**
*
*/
import jalview.bin.Cache;
import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.jws2.jabaws2.Jws2InstanceFactory;
import java.util.HashSet;
import java.util.Set;
{ Services.ClustalWS, Services.MuscleWS, Services.MafftWS,
Services.ProbconsWS, Services.TcoffeeWS, Services.AAConWS,
Services.DisemblWS, Services.GlobPlotWS, Services.IUPredWS,
- Services.JronnWS };
+ Services.JronnWS, Services.RNAalifoldWS };
/*
* (non-Javadoc)
jabasws2 = true;
srv_set = registry.getSupportedServices();
+
+ // dan test
+ System.out.println("registry.getSupportedServices: "
+ + srv_set.toString());
+
svccategories = registry.getServiceCategories();
+ // dan test
+ // System.out.println("registry.getServiceCategories: " +
+ // svccategories.toString());
+
}
} catch (Exception ex)
{
String description = registry.getServiceDescription(srv);
- svc = new Jws2Instance(jwsservers, srv.toString(),
- cat.name, description, service);
+ svc = Jws2InstanceFactory.newJws2Instance(jwsservers,
+ srv.toString(), cat.name, description, service);
}
if (svc == null)
{
- svc = new Jws2Instance(jwsservers, srv.toString(),
- cat.name, "JABAWS 1 Alignment Service", service);
+ svc = Jws2InstanceFactory.newJws2Instance(jwsservers,
+ srv.toString(), cat.name,
+ "JABAWS 1 Alignment Service", service);
}
jws2Discoverer.addService(jwsservers, svc);
}