X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FEnfinEnvision2OneWay.java;h=70ef6099effd2131a5ee647943e8dcacb20af7a1;hb=f6a7e5514230be7ea8c2d4cccb504b4ed95f80ef;hp=503245b723fa526185f1dce148394165b324b619;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git diff --git a/src/jalview/ws/EnfinEnvision2OneWay.java b/src/jalview/ws/EnfinEnvision2OneWay.java index 503245b..70ef609 100644 --- a/src/jalview/ws/EnfinEnvision2OneWay.java +++ b/src/jalview/ws/EnfinEnvision2OneWay.java @@ -1,13 +1,13 @@ /* - * 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) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * 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. - * + * * 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 @@ -152,19 +152,22 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements System.err.println("Adding entry for " + wfname + " " + description); if (wfname.toLowerCase().indexOf("funcnet") == -1) { - description = Pattern.compile("\\s+",Pattern.MULTILINE).matcher(description).replaceAll(" "); + description = Pattern.compile("\\s+", Pattern.MULTILINE) + .matcher(description).replaceAll(" "); groupURLdescr.addElement(description); groupURLdescr.addElement(description); - String urlstub=wfname; - if (wfname.indexOf(" ")>-1) + String urlstub = wfname; + if (wfname.indexOf(" ") > -1) { - // make the name safe! - try { - urlstub = URLEncoder.encode(wfname,"utf-8"); - } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + // make the name safe! + try + { + urlstub = URLEncoder.encode(wfname, "utf-8"); + } catch (UnsupportedEncodingException e) + { + // TODO Auto-generated catch block + e.printStackTrace(); + } } groupURLLinks .addElement(wfname @@ -323,10 +326,14 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements return; } } - try { + try + { descr = HtmlEncoder.encode(descr); - } catch (Exception e){}; - + } catch (Exception e) + { + } + ; + boolean seqsorids = (urlgenerator.getGroupURLType() & urlgenerator.SEQUENCEIDS) == 0; int i = urlgenerator.getNumberInvolved(urlstub); JMenuItem item = new JMenuItem(label);