From 9fdc6f62bbd8cdfb0aff4e392777dd98239f0f6b Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Wed, 14 Dec 2016 16:55:20 +0100 Subject: [PATCH] Fixed java 7 build error and sun dependency warnings --- Zutil.iml | 2 +- src/zutil/net/http/page/HttpDigestAuthPage.java | 1 - src/zutil/net/nio/worker/chat/ChatService.java | 2 +- src/zutil/net/ws/soap/SOAPHttpPage.java | 3 ++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Zutil.iml b/Zutil.iml index cbd59c3..f4cd222 100755 --- a/Zutil.iml +++ b/Zutil.iml @@ -1,6 +1,6 @@ - + diff --git a/src/zutil/net/http/page/HttpDigestAuthPage.java b/src/zutil/net/http/page/HttpDigestAuthPage.java index cdf8ea7..3a8525a 100755 --- a/src/zutil/net/http/page/HttpDigestAuthPage.java +++ b/src/zutil/net/http/page/HttpDigestAuthPage.java @@ -1,6 +1,5 @@ package zutil.net.http.page; -import sun.net.www.HeaderParser; import zutil.Hasher; import zutil.log.LogUtil; import zutil.net.http.HttpHeader; diff --git a/src/zutil/net/nio/worker/chat/ChatService.java b/src/zutil/net/nio/worker/chat/ChatService.java index 0adb61e..4c4850d 100755 --- a/src/zutil/net/nio/worker/chat/ChatService.java +++ b/src/zutil/net/nio/worker/chat/ChatService.java @@ -126,7 +126,7 @@ public class ChatService extends ThreadedEventWorker{ private void addRoom(String room){ if(!rooms.containsKey(room)){ logger.fine("New Chat Room: "+room); - rooms.put(room, new LinkedList<>()); + rooms.put(room, new LinkedList()); } } diff --git a/src/zutil/net/ws/soap/SOAPHttpPage.java b/src/zutil/net/ws/soap/SOAPHttpPage.java index 0090336..78b377e 100755 --- a/src/zutil/net/ws/soap/SOAPHttpPage.java +++ b/src/zutil/net/ws/soap/SOAPHttpPage.java @@ -38,6 +38,7 @@ import zutil.net.http.HttpPage; import zutil.net.http.HttpPrintStream; import zutil.net.ws.*; import zutil.net.ws.WSReturnObject.WSValueName; +import zutil.parser.Base64Encoder; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -325,7 +326,7 @@ public class SOAPHttpPage implements HttpPage{ if(byte[].class.isAssignableFrom(obj.getClass())){ Element valueE = root.addElement( elementName ); valueE.addAttribute("type", "xsd:"+ getSOAPClassName(obj.getClass())); - String tmp = new sun.misc.BASE64Encoder().encode((byte[])obj); + String tmp = Base64Encoder.encode((byte[])obj); tmp = tmp.replaceAll("\\s", ""); valueE.setText(tmp); }