Révision 3806

TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionPanel.java (revision 3806)
899 899
		// page_label.setText(makePageLabel());
900 900
	}
901 901

  
902
	private static String fromEncodeString = "é-è-ê-ë-ē-á-à-â-ä-å-ó-ò-ô-ö-ő-õ-ø-î-ï-ì-í-ù-û-ü-ú-ű-ŭ-ÿ-ŷ-ỳ-ý-ŕ-ŝ-ẑ-ĝ-ģ-ĥ-ḧ-ĵ-ẅ-ŵ-ẍ-ĉ-ç-č-ñ";
903
	private static String toEncodeString = "%C3%A9-%C3%A8-%C3%AA-%C3%AB-%C4%93-%C3%A1-%C3%A0-%C3%A2-%C3%A4-%C3%A5-%C3%B3-%C3%B2-%C3%B4-%C3%B6-%C5%91-%C3%B5-%C3%B8-%C3%AE-%C3%AF-%C3%AC-%C3%AD-%C3%B9-%C3%BB-%C3%BC-%C3%BA-%C5%B1-%C5%AD-%C3%BF-%C5%B7-%E1%BB%B3-%C3%BD-%C5%95-%C5%9D-%E1%BA%91-%C4%9D-%C4%A3-%C4%A5-%E1%B8%A7-%C4%B5-%E1%BA%85-%C5%B5-%E1%BA%8D-%C4%89-%C3%A7-%C4%8D-%C3%B1%0A";
902
	public static String fromEncodeString = "\"-&-'-<->-`- -¡-¢-£-¥-§-©-«-®-°-±-´-µ-¶-·-»-¿-À-Á-Â-Ã-Ä-Æ-Ç-È-É-Ê-Ë-Ì-Í-Î-Ï-Ñ-Ò-Ó-Ô-Õ-Ö-Ø-Ù-Ú-Û-Ü-ß-à-á-â-ã-ä-å-æ-ç-è-é-ê-ë-ì-í-î-ï-ð-ñ-ò-ó-ô-õ-ö-÷-ø-ù-ú-û-ü-ý-ÿ-Ā-ā-ĉ-Č-č-ē-ĝ-ģ-ĥ-Ī-ī-ĵ-ő-œ-ŕ-ř-ŝ-Š-š-Ū-ū-ŭ-ű-ŵ-ŷ-π-ḧ-ẅ-ẍ-ẑ-ỳ- - -–-—-‘-’-•-′-″-€-™-←-↑-→-↓-↖-↗-↘-↙-⌘-⏏-☑-✔";
903
	public static String toEncodeString = "%22-%26-%27-%3C-%3E-%60-%C2%A0-%C2%A1-%C2%A2-%C2%A3-%C2%A5-%C2%A7-%C2%A9-%C2%AB-%C2%AE-%C2%B0-%C2%B1-%C2%B4-%C2%B5-%C2%B6-%C2%B7-%C2%BB-%C2%BF-%C3%80-%C3%81-%C3%82-%C3%83-%C3%84-%C3%86-%C3%87-%C3%88-%C3%89-%C3%8A-%C3%8B-%C3%8C-%C3%8D-%C3%8E-%C3%8F-%C3%91-%C3%92-%C3%93-%C3%94-%C3%95-%C3%96-%C3%98-%C3%99-%C3%9A-%C3%9B-%C3%9C-%C3%9F-%C3%A0-%C3%A1-%C3%A2-%C3%A3-%C3%A4-%C3%A5-%C3%A6-%C3%A7-%C3%A8-%C3%A9-%C3%AA-%C3%AB-%C3%AC-%C3%AD-%C3%AE-%C3%AF-%C3%B0-%C3%B1-%C3%B2-%C3%B3-%C3%B4-%C3%B5-%C3%B6-%C3%B7-%C3%B8-%C3%B9-%C3%BA-%C3%BB-%C3%BC-%C3%BD-%C3%BF-%C4%80-%C4%81-%C4%89-%C4%8C-%C4%8D-%C4%93-%C4%9D-%C4%A3-%C4%A5-%C4%AA-%C4%AB-%C4%B5-%C5%91-%C5%93-%C5%95-%C5%99-%C5%9D-%C5%A0-%C5%A1-%C5%AA-%C5%AB-%C5%AD-%C5%B1-%C5%B5-%C5%B7-%CF%80-%E1%B8%A7-%E1%BA%85-%E1%BA%8D-%E1%BA%91-%E1%BB%B3-%E2%80%82-%E2%80%83-%E2%80%93-%E2%80%94-%E2%80%98-%E2%80%99-%E2%80%A2-%E2%80%B2-%E2%80%B3-%E2%82%AC-%E2%84%A2-%E2%86%90-%E2%86%91-%E2%86%92-%E2%86%93-%E2%86%96-%E2%86%97-%E2%86%98-%E2%86%99-%E2%8C%98-%E2%8F%8F-%E2%98%91-%E2%9C%94";
904 904
	private static String[] fromEncode, toEncode;
905 905
	static { // GTK webkit URL encoding differs from Java File.toURI() encoding
906 906
		if ("gtk".equals(System.getProperty("osgi.ws"))) {
......
908 908
			toEncode = toEncodeString.split("-");
909 909
		}
910 910
	}
911
	
912
	public static String encodeURL(String url) {
913
		for (int i = 0 ; i < fromEncode.length ; i++) {
914
			url = url.replace(fromEncode[i], toEncode[i]);
915
		}
916
		return url;
917
	}
911 918

  
912 919
	@Override
913 920
	public void setURL(String url) {
914 921

  
915 922
		if (!this.browser.isDisposed()) {
916 923
			if (fromEncode != null) {
917
				for (int i = 0 ; i < fromEncode.length ; i++) {
918
					url = url.replace(fromEncode[i], toEncode[i]);
919
				}
924
				url = encodeURL(url);
920 925
			}
921 926
			super.setURL(url);
922 927

  

Formats disponibles : Unified diff