-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5 from wimsymons/fix-encoding-issue
Changes for v1.5 - Fix encoding issues
- Loading branch information
Showing
30 changed files
with
935 additions
and
1,445 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,2 @@ | ||
.idea/ | ||
out/ | ||
src/testdata/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
<idea-plugin version="2" url="https://github.com/wimsymons/intellij-ppimport"> | ||
<id>be.wimsymons.intellij.polopolyimport</id> | ||
<name>Polopoly Importer</name> | ||
<version>1.4</version> | ||
<version>1.5</version> | ||
<vendor email="[email protected]">Wim Symons</vendor> | ||
|
||
<description><![CDATA[ | ||
|
@@ -15,8 +15,11 @@ This version keeps state on application-level, not on project level. | |
|
||
<change-notes><![CDATA[ | ||
<dl> | ||
<dt>1.5</dt> | ||
<dd>Fixed charset conversion issues</dd> | ||
<dt>1.4</dt> | ||
<dd>1.4 Fixed NullPointerException on IDEA 12</dd> | ||
<dd>Fixed NullPointerException on IDEA 12</dd> | ||
<dt>1.3</dt> | ||
<dd>Fixed issue with Guava deprecating Closeables.closeQuietly in Guava 15</dd> | ||
|
@@ -76,4 +79,4 @@ This version keeps state on application-level, not on project level. | |
</group> | ||
</actions> | ||
|
||
</idea-plugin> | ||
</idea-plugin> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 0 additions & 27 deletions
27
src/main/be/wimsymons/intellij/polopolyimport/io/ReplacementsInputStreamBuilder.java
This file was deleted.
Oops, something went wrong.
29 changes: 29 additions & 0 deletions
29
src/main/be/wimsymons/intellij/polopolyimport/io/ReplacementsReaderBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package be.wimsymons.intellij.polopolyimport.io; | ||
|
||
import be.wimsymons.intellij.polopolyimport.Replacement; | ||
import com.google.common.base.Strings; | ||
import sdsu.io.StringReplaceReader; | ||
|
||
import java.io.Reader; | ||
import java.util.List; | ||
|
||
public class ReplacementsReaderBuilder { | ||
|
||
public static Reader with(final Reader in, final List<Replacement> replacements) { | ||
if (replacements.isEmpty()) { | ||
return in; | ||
} else { | ||
StringReplaceReader replaceReader = null; | ||
for (Replacement replacement : replacements) { | ||
if (!Strings.isNullOrEmpty(replacement.getSearch())) { | ||
if (replaceReader == null) { | ||
replaceReader = new StringReplaceReader(in, replacement.getSearch(), replacement.getReplacement()); | ||
} else { | ||
replaceReader.replace(replacement.getSearch(), replacement.getReplacement()); | ||
} | ||
} | ||
} | ||
return replaceReader; | ||
} | ||
} | ||
} |
44 changes: 0 additions & 44 deletions
44
src/main/org/codehaus/swizzle/stream/FilteredInputStream.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.