Merge branch 'nb73dev'

junichi11 · junichi11 · commit 053e20c64254 · 2013-03-24T12:00:12.000+09:00
diff --git a/manifest.mf b/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.php.wordpress
 OpenIDE-Module-Layer: org/netbeans/modules/php/wordpress/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/wordpress/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.4.4
+OpenIDE-Module-Specification-Version: 0.4.5
 
diff --git a/src/org/netbeans/modules/php/wordpress/ui/status/DebugStatusLineElement.java b/src/org/netbeans/modules/php/wordpress/ui/status/DebugStatusLineElement.java
@@ -176,7 +176,7 @@ private void writeConfig(String debugLv) {
             return;
         }
         try {
-            List<String> lines = config.asLines();
+            List<String> lines = config.asLines(Charset.UTF8);
             Pattern pattern = Pattern.compile(DEBUG_REGEX);
             PrintWriter pw = new PrintWriter(new OutputStreamWriter(config.getOutputStream(), Charset.UTF8));
             try {

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ private void writeConfig(String debugLv) {`
`176`	`176`	`return;`
`177`	`177`	`}`
`178`	`178`	`try {`
`179`		`- List<String> lines = config.asLines();`
	`179`	`+ List<String> lines = config.asLines(Charset.UTF8);`
`180`	`180`	`Pattern pattern = Pattern.compile(DEBUG_REGEX);`
`181`	`181`	`PrintWriter pw = new PrintWriter(new OutputStreamWriter(config.getOutputStream(), Charset.UTF8));`
`182`	`182`	`try {`