Skip to content

Commit 265ddf7

Browse files
Martin VigliaroloMartin Vigliarolo
authored andcommitted
First stage of changes regarding HTTPClient module movement into android package
1 parent c37ed00 commit 265ddf7

File tree

8 files changed

+12
-63
lines changed

8 files changed

+12
-63
lines changed

common/src/main/java/HTTPClient/HTTPConnection.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -664,11 +664,11 @@ public static String descramble(String scrambled)
664664
*
665665
* @param applet the current applet
666666
*/
667-
public HTTPConnection(Object applet) throws ProtocolNotSuppException
668-
{
669-
if (SpecificImplementation.HTTPConnection != null)
670-
SpecificImplementation.HTTPConnection.createHttpConnectionFromApplet(applet, this);
671-
}
667+
// public HTTPConnection(Object applet) throws ProtocolNotSuppException
668+
// {
669+
// if (SpecificImplementation.HTTPConnection != null)
670+
// SpecificImplementation.HTTPConnection.createHttpConnectionFromApplet(applet, this);
671+
// }
672672

673673

674674
/**

common/src/main/java/com/genexus/common/interfaces/IExtensionHTTPConnection.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

common/src/main/java/com/genexus/common/interfaces/SpecificImplementation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class SpecificImplementation {
2424
public static IExtensionMessages Messages;
2525
public static IExtensionPictureFormatter PictureFormatter;
2626
public static IExtensionSdtMessages_Message SdtMessages_Message;
27-
public static IExtensionHTTPConnection HTTPConnection;
27+
// public static IExtensionHTTPConnection HTTPConnection;
2828
public static ICryptoAlhorithms Algorithms;
2929
public static IExtensionModelContext ModelContext;
3030
public static boolean KeepDecimals;

common/src/main/java/com/genexus/internet/GXHttpClient.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.genexus.internet;
22

3-
import HTTPClient.ParseException;
4-
import HTTPClient.URI;
53
import com.genexus.CommonUtil;
64
import com.genexus.common.interfaces.SpecificImplementation;
75
import java.io.*;
6+
import java.net.URISyntaxException;
87
import java.util.Hashtable;
98
import java.util.Vector;
109

@@ -130,17 +129,17 @@ public boolean getIncludeCookies()
130129
return this.includeCookies;
131130
}
132131

133-
public void setURL(String stringURL)
134-
{
132+
@Override
133+
public void setURL(String stringURL) {
135134
try
136135
{
137-
URI url = new URI(stringURL);
136+
java.net.URI url = new java.net.URI(stringURL);
138137
setHost(url.getHost());
139138
setPort(url.getPort());
140139
setBaseURL(url.getPath());
141140
setSecure(url.getScheme().equalsIgnoreCase("https") ? 1 : 0);
142141
}
143-
catch (ParseException e)
142+
catch (URISyntaxException e)
144143
{
145144
System.err.println("E " + e + " " + stringURL);
146145
e.printStackTrace();

java/src/main/java/com/genexus/internet/HttpClientJavaLib.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -163,23 +163,6 @@ private void resetStateAdapted()
163163
getheadersToSend().clear();
164164
}
165165

166-
@Override
167-
public void setURL(String stringURL) {
168-
try
169-
{
170-
java.net.URI url = new java.net.URI(stringURL);
171-
setHost(url.getHost());
172-
setPort(url.getPort());
173-
setBaseURL(url.getPath());
174-
setSecure(url.getScheme().equalsIgnoreCase("https") ? 1 : 0);
175-
}
176-
catch (URISyntaxException e)
177-
{
178-
System.err.println("E " + e + " " + stringURL);
179-
e.printStackTrace();
180-
}
181-
}
182-
183166
private String getURLValid(String url) {
184167
java.net.URI uri;
185168
try

java/src/main/java/com/genexus/specific/java/Connect.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static void init()
3232
if (!ApplicationContext.getInstance().getReorganization())
3333
SpecificImplementation.GXXMLSerializer = new GXXMLserializer();
3434
SpecificImplementation.HttpClient = new HttpClient();
35-
SpecificImplementation.HTTPConnection = new HTTPConnection();
35+
// SpecificImplementation.HTTPConnection = new HTTPConnection();
3636
SpecificImplementation.HttpCookie = new HttpCookie();
3737
SpecificImplementation.ImagesPath = new ImagesPath();
3838
SpecificImplementation.LocalUtil = new LocalUtil();

java/src/main/java/com/genexus/specific/java/HTTPConnection.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)