Salome HOME
projects / tools / siman.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 32824e1)
Fix for uploading of files with names containing specific (accented, ampersand) chara...
authorrkv <rkv@opencascade.com>
Tue, 16 Apr 2013 08:50:11 +0000 (08:50 +0000)
committerrkv <rkv@opencascade.com>
Tue, 16 Apr 2013 08:50:11 +0000 (08:50 +0000)
Workspace/Siman/WebContent/layout/baseLayout.jsp patch | blob | history
Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp patch | blob | history
Workspace/Siman/WebContent/layout/homeLayout.jsp patch | blob | history
Workspace/Siman/WebContent/layout/layoutLogin.jsp patch | blob | history
Workspace/Siman/WebContent/layout/welcomeLayout.jsp patch | blob | history
Workspace/Siman/src/org/splat/simer/UploadAction.java patch | blob | history

diff --git a/Workspace/Siman/WebContent/layout/baseLayout.jsp b/Workspace/Siman/WebContent/layout/baseLayout.jsp
index 07aff59914204b61aee546c049f37432457b0ca6..3d1689dd71010eb17ea5417868252e57b6570d5e 100644 (file)
--- a/Workspace/Siman/WebContent/layout/baseLayout.jsp
+++ b/Workspace/Siman/WebContent/layout/baseLayout.jsp
@@ -1,4 +1,5 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
 <%@ taglib prefix="s" uri="/struts-tags"%>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp b/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp
index 4401d4d883edcc7db578bcee69b4b7b99c56e328..1af287adc890cca5590e0a9353bc3efde88bedee 100644 (file)
--- a/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp
+++ b/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp
@@ -1,4 +1,5 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
 <%@ taglib prefix="s" uri="/struts-tags"%>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/Workspace/Siman/WebContent/layout/homeLayout.jsp b/Workspace/Siman/WebContent/layout/homeLayout.jsp
index 3de62f229ff3aac2bbc1ea5134053f5bd664dfdb..c8b78b955a9a04826ef3e3a181361352ea829612 100644 (file)
--- a/Workspace/Siman/WebContent/layout/homeLayout.jsp
+++ b/Workspace/Siman/WebContent/layout/homeLayout.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
 <%@ taglib prefix="s" uri="/struts-tags"%>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/Workspace/Siman/WebContent/layout/layoutLogin.jsp b/Workspace/Siman/WebContent/layout/layoutLogin.jsp
index ca97ea47e2c3b421c8c666d3f9ae2fa09fdf8293..e4e188a86b541b98052711a9673591ceab6e3f38 100644 (file)
--- a/Workspace/Siman/WebContent/layout/layoutLogin.jsp
+++ b/Workspace/Siman/WebContent/layout/layoutLogin.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
 <%@ taglib prefix="s" uri="/struts-tags"%>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/Workspace/Siman/WebContent/layout/welcomeLayout.jsp b/Workspace/Siman/WebContent/layout/welcomeLayout.jsp
index 86dd973866a40bc822c2f9c37975367286bc7a03..c854edae938966d97798801de8db915e957f80c2 100644 (file)
--- a/Workspace/Siman/WebContent/layout/welcomeLayout.jsp
+++ b/Workspace/Siman/WebContent/layout/welcomeLayout.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
 <%@ taglib prefix="s" uri="/struts-tags"%>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/Workspace/Siman/src/org/splat/simer/UploadAction.java b/Workspace/Siman/src/org/splat/simer/UploadAction.java
index 742b2137142d504f1b320c94f8c3a19724529e7b..95b5b3874f74a086e691303a0277d101776271b2 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/UploadAction.java
+++ b/Workspace/Siman/src/org/splat/simer/UploadAction.java
@@ -172,7 +172,7 @@ public class UploadAction extends Action {
        public String getCanceledFileName() {
                String res = _uploadFileName;
                try {
-                       res = URLEncoder.encode(res, "UTF-8");
+                       res = URLEncoder.encode(res, "ISO-8859-1");
                } catch (UnsupportedEncodingException e) {
                        LOG.error("Reason: ", e);
                }
SALOME simulation manager [DEPRECATED]

Copyright © 2005–2024 Open CASCADE.
All rights reserved.
Legal Information