# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: E:\netbeans_work\nb551\netbeans-src\javadoc\src\org\netbeans\modules\javadoc\search # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: Jdk12SearchType_japan.java *** E:\netbeans_work\nb551\netbeans-src\javadoc\src\org\netbeans\modules\javadoc\search\Jdk12SearchType_japan.java Base (1.9.80.1) --- E:\netbeans_work\nb551\netbeans-src\javadoc\src\org\netbeans\modules\javadoc\search\Jdk12SearchType_japan.java Locally Modified (Based On 1.9.80.1) *************** *** 23,28 **** --- 23,32 ---- + import java.io.BufferedReader; + import java.io.IOException; + import java.io.InputStream; + import java.io.InputStreamReader; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; import org.openide.filesystems.FileObject; *************** *** 86,111 **** return false; } encoding = encoding.toLowerCase(); - String acceptedEncoding = getJapanEncoding().toLowerCase(); ! if ("jisautodetect".equals(acceptedEncoding)) { //NOI18N ! return "iso-2022-jp".equals (encoding) || //NOI18N ! "sjis".equals (encoding) || //NOI18N ! "euc-jp".equals (encoding); //NOI18N ! // || "utf-".equals (encoding); XXX Probably not, UTF-8 can be anything ???? } ! else { ! return encoding.equals (acceptedEncoding); //NOI18N } } } --- 90,144 ---- return false; } encoding = encoding.toLowerCase(); ! // if Japanese encoding, return true quickly ! if("iso-2022-jp".equals(encoding) || //NOI18N ! "sjis".equals(encoding) || //NOI18N ! "euc-jp".equals(encoding) ) { //NOI18N ! setJapanEncoding(encoding); ! return true; ! } + if("utf-8".equals(encoding)){ //NOI18N + + try { + FileObject fo = root.getFileObject("allclasses-frame.html"); + if (fo == null) { + return false; } ! InputStream is = fo.getInputStream(); ! boolean jazip = false; ! try { ! BufferedReader r = new BufferedReader(new InputStreamReader(is, encoding)); ! String line; ! while ((line = r.readLine()) != null) { ! if(line.contains(NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_ALLCLASSES_JA"))){ //NOI18N ! jazip = true; } + if(line.toLowerCase().contains("")) { + break; } + } + } finally { + is.close(); + } + if(jazip) { + setJapanEncoding(encoding); + } + return jazip; + } catch (IOException ioe) { + } + } + return false; + } + } Index: Bundle.properties *** E:\netbeans_work\nb551\netbeans-src\javadoc\src\org\netbeans\modules\javadoc\search\Bundle.properties Base (1.62.34.1.2.2) --- E:\netbeans_work\nb551\netbeans-src\javadoc\src\org\netbeans\modules\javadoc\search\Bundle.properties Locally Modified (Based On 1.62.34.1.2.2) *************** *** 104,109 **** --- 104,112 ---- JDK12_METHOD_JA=MESODDO JDK12_VARIABLE_JA=HENSUU + # "All Classes" translation of javadoc output + JDK12_ALLCLASSES_JA=SUBETENOKURASU + CTL_SEARCH_ButtonHelp=Help CTL_SEARCH_ButtonHelp_Mnemonic=H