diff --git a/designer-base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java b/designer-base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java index 16d9966a11..93d4821399 100644 --- a/designer-base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java +++ b/designer-base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java @@ -61,6 +61,8 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.net.MalformedURLException; +import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -205,7 +207,7 @@ public class FileTableDataPane extends AbstractTableDataPane { private ActionListener testConnectionListener = new ActionListener() { public void actionPerformed(ActionEvent arg0) { - String uri = urlText.getText(); + String uri = ParameterHelper.analyze4Templatee( urlText.getText(), params); if (!checkURL(uri)) { JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(FileTableDataPane.this), Inter.getLocText("FR-Designer_Add_JS_warning")); return; @@ -318,7 +320,13 @@ public class FileTableDataPane extends AbstractTableDataPane { } private boolean checkURL(String uri){ - return (uri.matches("https*://.+|\\$\\{.+\\}.*")); + try { + new URL(uri); + return true; + } catch (MalformedURLException e) { + return false; + } + // return (uri.matches("https*://.+|\\$\\{.+\\}.*")); } private JPanel textSetPanel(int width,int height) {