Upgrade to jansi-native 1.6-SNAPSHOT

fusesource · Oct 14, 2015 · bc4e70a · bc4e70a
1 parent 4a018a5
commit bc4e70a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/jansi/pom.xml b/jansi/pom.xml
@@ -33,13 +33,13 @@
     <dependency>
       <groupId>org.fusesource.hawtjni</groupId>
       <artifactId>hawtjni-runtime</artifactId>
-      <version>1.8</version>
+      <version>1.9</version>
     </dependency>
 
     <dependency>
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi-native</artifactId>
-      <version>1.5</version>
+      <version>1.6-SNAPSHOT</version>
     </dependency>
 
     <!-- Bundle in the native libs for Windows, OS X, and 
@@ -49,31 +49,31 @@
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi-native</artifactId>
       <classifier>windows32</classifier>
-      <version>1.5</version>
+      <version>1.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi-native</artifactId>
       <classifier>windows64</classifier>
-      <version>1.5</version>
+      <version>1.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi-native</artifactId>
       <classifier>osx</classifier>
-      <version>1.5</version>
+      <version>1.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi-native</artifactId>
       <classifier>linux32</classifier>
-      <version>1.5</version>
+      <version>1.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi-native</artifactId>
       <classifier>linux64</classifier>
-      <version>1.5</version>
+      <version>1.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/jansi/src/main/java/org/fusesource/jansi/WindowsAnsiOutputStream.java b/jansi/src/main/java/org/fusesource/jansi/WindowsAnsiOutputStream.java
@@ -24,7 +24,7 @@
 import static org.fusesource.jansi.internal.Kernel32.FOREGROUND_GREEN;
 import static org.fusesource.jansi.internal.Kernel32.FOREGROUND_INTENSITY;
 import static org.fusesource.jansi.internal.Kernel32.FOREGROUND_RED;
-import static org.fusesource.jansi.internal.Kernel32.FillConsoleOutputAttributeW;
+import static org.fusesource.jansi.internal.Kernel32.FillConsoleOutputAttribute;
 import static org.fusesource.jansi.internal.Kernel32.FillConsoleOutputCharacterW;
 import static org.fusesource.jansi.internal.Kernel32.GetConsoleScreenBufferInfo;
 import static org.fusesource.jansi.internal.Kernel32.GetStdHandle;
@@ -146,7 +146,7 @@ protected void processEraseScreen(int eraseOption) throws IOException {
 			topLeft.x = 0;
 			topLeft.y = info.window.top;
 			int screenLength = info.window.height() * info.size.x;
-			FillConsoleOutputAttributeW(console, originalColors, screenLength, topLeft, written);
+			FillConsoleOutputAttribute(console, originalColors, screenLength, topLeft, written);
 			FillConsoleOutputCharacterW(console, ' ', screenLength, topLeft, written);
 			break;
 		case ERASE_SCREEN_TO_BEGINING:
@@ -155,13 +155,13 @@ protected void processEraseScreen(int eraseOption) throws IOException {
 			topLeft2.y = info.window.top;
 			int lengthToCursor = (info.cursorPosition.y - info.window.top) * info.size.x 
 				+ info.cursorPosition.x;
-			FillConsoleOutputAttributeW(console, originalColors, lengthToCursor, topLeft2, written);
+			FillConsoleOutputAttribute(console, originalColors, lengthToCursor, topLeft2, written);
 			FillConsoleOutputCharacterW(console, ' ', lengthToCursor, topLeft2, written);
 			break;
 		case ERASE_SCREEN_TO_END:
 			int lengthToEnd = (info.window.bottom - info.cursorPosition.y) * info.size.x + 
 				(info.size.x - info.cursorPosition.x);
-			FillConsoleOutputAttributeW(console, originalColors, lengthToEnd, info.cursorPosition.copy(), written);
+			FillConsoleOutputAttribute(console, originalColors, lengthToEnd, info.cursorPosition.copy(), written);
 			FillConsoleOutputCharacterW(console, ' ', lengthToEnd, info.cursorPosition.copy(), written);
 		}		
 	}
@@ -174,18 +174,18 @@ protected void processEraseLine(int eraseOption) throws IOException {
 		case ERASE_LINE:
 			COORD leftColCurrRow = info.cursorPosition.copy();
 			leftColCurrRow.x = 0;
-			FillConsoleOutputAttributeW(console, originalColors, info.size.x, leftColCurrRow, written);
+			FillConsoleOutputAttribute(console, originalColors, info.size.x, leftColCurrRow, written);
 			FillConsoleOutputCharacterW(console, ' ', info.size.x, leftColCurrRow, written);
 			break;
 		case ERASE_LINE_TO_BEGINING:
 			COORD leftColCurrRow2 = info.cursorPosition.copy();
 			leftColCurrRow2.x = 0;
-			FillConsoleOutputAttributeW(console, originalColors, info.cursorPosition.x, leftColCurrRow2, written);
+			FillConsoleOutputAttribute(console, originalColors, info.cursorPosition.x, leftColCurrRow2, written);
 			FillConsoleOutputCharacterW(console, ' ', info.cursorPosition.x, leftColCurrRow2, written);
 			break;
 		case ERASE_LINE_TO_END:
 			int lengthToLastCol = info.size.x - info.cursorPosition.x;
-			FillConsoleOutputAttributeW(console, originalColors, lengthToLastCol, info.cursorPosition.copy(), written);
+			FillConsoleOutputAttribute(console, originalColors, lengthToLastCol, info.cursorPosition.copy(), written);
 			FillConsoleOutputCharacterW(console, ' ', lengthToLastCol, info.cursorPosition.copy(), written);
 		}
 	}