Fixed some warnings and started on the NetLog project

This commit is contained in:
Ziver Koc 2013-05-03 19:31:45 +00:00
parent db9b2bf307
commit 27b12e1b9b
29 changed files with 722 additions and 322 deletions

View file

@ -107,7 +107,7 @@ public class HttpClient {
}
else
request.println("");
request.flush();
request.close();
// Response
BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()));

View file

@ -85,6 +85,7 @@ public class HttpHeaderParser {
parseLine( tmp );
}
}
sc.close();
parseCookies();
}

View file

@ -21,11 +21,6 @@
******************************************************************************/
package zutil.net.http.multipart;
import java.io.BufferedReader;
import java.io.File;
import zutil.ProgressListener;
/**
* A class for handling multipart field

View file

@ -21,11 +21,8 @@
******************************************************************************/
package zutil.net.http.multipart;
import java.io.BufferedReader;
import java.io.File;
import zutil.ProgressListener;
/**
* A class for handling multipart files

View file

@ -21,12 +21,8 @@
******************************************************************************/
package zutil.net.http.multipart;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@ -101,83 +97,15 @@ public class MultipartParser {
*/
public List<MultipartField> parse() throws IOException{
ArrayList<MultipartField> list = new ArrayList<MultipartField>();
// TODO: parse(list, delimiter);
parse(list, delimiter);
return list;
}
// TODO:
/*
private void parse(List<MultipartField> list, String delimiter) throws IOException{
String line = "";
MultipartField field = null;
delimiter = "--"+delimiter;
String endDelimiter = delimiter+"--";
BufferedWriter out = null;
// Parsing the stream
while(line != null){
line = in.readLine();
// Skip empty lines
if(line == null || line.trim().isEmpty())
continue;
// End of field
else if(line.equals( endDelimiter )){
list.add(field);
if(out != null) out.close();
field.length = field.file.length();
out = null;
field = null;
continue;
}
// New field
else if(line.equals( delimiter )){
if(field != null){
list.add(field);
if(out != null) out.close();
field.length = field.file.length();
out = null;
field = null;
}
// Read the content-disposition
line = in.readLine();
if(line.toLowerCase().startsWith("content-disposition")){
line = line.split(":", 2)[1];
String[] fieldData = line.split(" *; *");
//String type = fieldData[0].toLowerCase();
field = new MultipartField();
field.type = MultipartField.FieldType.Field;
// Parse content-disposition parameters
for(String param : fieldData){
String[] temp = param.split(" *= *");
if(temp[0].equalsIgnoreCase("name"))
field.fieldname = temp[1];
else if(temp[0].equalsIgnoreCase("filename")){
field.filename = temp[1];
field.file = createTempFile();
out = new BufferedWriter(new FileWriter(field.file));
field.type = MultipartField.FieldType.File;
}
}
}
else
throw new IOException("MultipartForm parse error unrecognized line: "+line);
}
// Read field data
else if(field != null){
if(field.type == MultipartField.FieldType.File){
out.append(line);
}
else{
field.value += line;
}
field.received += line.length();
}
}
if(field != null)
throw new IOException("MultipartForm parse error stream ended prematurely");
// TODO:
}
*/
/**
* Creates a temporary file in either the system

View file

@ -46,7 +46,7 @@ import zutil.net.ws.WSParameterDef;
import zutil.net.ws.WSReturnObject;
import zutil.net.ws.WSReturnObject.WSValueName;
import zutil.net.ws.WebServiceDef;
import zutil.parser.wsdl.WSDLWriter;
import zutil.parser.wsdl.WSDLWriterOld;
/**
* This is an HTTPPage for the HTTPServer that
@ -87,7 +87,7 @@ public class SOAPHttpPage implements HttpPage{
/** This instance of the web service class is used if session is disabled **/
private WSInterface ws;
/** The WSDL document **/
private WSDLWriter wsdl;
private WSDLWriterOld wsdl;
/** Session enabled **/
private boolean session_enabled;
@ -95,7 +95,7 @@ public class SOAPHttpPage implements HttpPage{
this.wsDef = wsDef;
this.session_enabled = false;
wsdl = new WSDLWriter( wsDef );
wsdl = new WSDLWriterOld( wsDef );
}
/**

View file

@ -43,7 +43,7 @@ import zutil.log.LogUtil;
* @author Ziver
*/
public abstract class ThreadedTCPNetworkServer extends Thread{
public static final Logger logger = LogUtil.getLogger();
private static final Logger logger = LogUtil.getLogger();
public final int port;
private File keyStore;