Skip to content

Commit caa59b9

Browse files
asbjornuasbjornu
committed
Merge pull request #13 from GeirGrusom/master
Update to HtmlUnit 2.15.0
2 parents b040e68 + 284007c commit caa59b9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1283
-1119
lines changed

‎NHtmlUnit.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
33
<metadata>
44
<id>NHtmlUnit</id>
5-
<version>2.14.1.0</version>
5+
<version>2.15.0.0</version>
66
<title>NHtmlUnit</title>
77
<authors>OKB AS</authors>
88
<owners>OKB AS</owners>

‎app/GlobalAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
[assembly : AssemblyCopyright("Copyright © OKB AS 2014")]
1818
[assembly : AssemblyTrademark("OKB AS 2014")]
1919
[assembly : ComVisible(false)]
20-
[assembly : AssemblyVersion("2.14.1.0")]
21-
[assembly : AssemblyFileVersion("2.14.1.0")]
20+
[assembly : AssemblyVersion("2.15.0.0")]
21+
[assembly : AssemblyFileVersion("2.15.0.0")]

‎app/NHtmlUnit/Generated/CookieManager.cs‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,16 @@ public ICollection<NHtmlUnit.Util.Cookie> Cookies
3535
WObj.getCookies());
3636
}
3737
}
38-
// Generating method code for clearExpired
39-
public virtual bool ClearExpired(java.util.Date date)
40-
{
41-
return WObj.clearExpired(date);
42-
}
43-
4438
// Generating method code for isCookiesEnabled
4539
public virtual bool IsCookiesEnabled()
4640
{
4741
return WObj.isCookiesEnabled();
4842
}
4943

50-
// Generating method code for getCookies
51-
public virtual ICollection<NHtmlUnit.Util.Cookie> GetCookies(java.net.URL url)
44+
// Generating method code for clearExpired
45+
public virtual bool ClearExpired(java.util.Date date)
5246
{
53-
54-
return new CollectionWrapper<NHtmlUnit.Util.Cookie>(WObj.getCookies(url));
47+
return WObj.clearExpired(date);
5548
}
5649

5750
// Generating method code for getCookie

‎app/NHtmlUnit/Generated/Html/HtmlButton.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ public System.String OriginalName
122122
}
123123
}
124124

125-
public ICollection<System.String> PreviousNames
125+
public ICollection<System.String> NewNames
126126
{
127127
get
128128
{
129129
return new ShallowCollectionWrapper<System.String>(
130-
WObj.getPreviousNames());
130+
WObj.getNewNames());
131131
}
132132
}
133133
// Generating method code for isDisabled

‎app/NHtmlUnit/Generated/Html/HtmlImage.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@ public System.String SrcAttribute
3232
}
3333
}
3434

35-
public System.String UseMapAttribute
35+
public javax.imageio.ImageReader ImageReader
3636
{
3737
get
3838
{
39-
return WObj.getUseMapAttribute();
39+
return WObj.getImageReader();
4040
}
4141
}
4242

43-
public System.String IsmapAttribute
43+
public System.String UseMapAttribute
4444
{
4545
get
4646
{
47-
return WObj.getIsmapAttribute();
47+
return WObj.getUseMapAttribute();
4848
}
4949
}
5050

51-
public javax.imageio.ImageReader ImageReader
51+
public System.String IsmapAttribute
5252
{
5353
get
5454
{
55-
return WObj.getImageReader();
55+
return WObj.getIsmapAttribute();
5656
}
5757
}
5858

‎app/NHtmlUnit/Generated/Html/HtmlInput.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,12 @@ public System.String OriginalName
205205
}
206206
}
207207

208-
public ICollection<System.String> PreviousNames
208+
public ICollection<System.String> NewNames
209209
{
210210
get
211211
{
212212
return new ShallowCollectionWrapper<System.String>(
213-
WObj.getPreviousNames());
213+
WObj.getNewNames());
214214
}
215215
}
216216
// Generating method code for setValueAttribute

‎app/NHtmlUnit/Generated/Html/HtmlPage.cs‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,6 @@ public HtmlPage(java.net.URL originatingUrl, NHtmlUnit.WebResponse webResponse,
2727
: this(new com.gargoylesoftware.htmlunit.html.HtmlPage(originatingUrl, (com.gargoylesoftware.htmlunit.WebResponse)webResponse.WrappedObject, (com.gargoylesoftware.htmlunit.WebWindow)webWindow.WrappedObject)) {}
2828

2929

30-
public IList<NHtmlUnit.W3C.Dom.Ranges.IRange> SelectionRanges
31-
{
32-
get
33-
{
34-
return new ListWrapper<NHtmlUnit.W3C.Dom.Ranges.IRange>(
35-
WObj.getSelectionRanges());
36-
}
37-
}
38-
39-
public java.util.Map Namespaces
40-
{
41-
get
42-
{
43-
return WObj.getNamespaces();
44-
}
45-
}
46-
4730
public NHtmlUnit.Html.HtmlElement FocusedElement
4831
{
4932
get
@@ -131,12 +114,23 @@ public System.String TitleText
131114
}
132115

133116
}
134-
// Generating method code for save
135-
public virtual void Save(java.io.File file)
136-
{
137-
WObj.save(file);
138-
}
139-
117+
118+
public IList<NHtmlUnit.W3C.Dom.Ranges.IRange> SelectionRanges
119+
{
120+
get
121+
{
122+
return new ListWrapper<NHtmlUnit.W3C.Dom.Ranges.IRange>(
123+
WObj.getSelectionRanges());
124+
}
125+
}
126+
127+
public java.util.Map Namespaces
128+
{
129+
get
130+
{
131+
return WObj.getNamespaces();
132+
}
133+
}
140134
// Generating method code for isQuirksMode
141135
public virtual bool IsQuirksMode()
142136
{
@@ -155,18 +149,18 @@ public virtual bool SetFocusedElement(NHtmlUnit.Html.HtmlElement newElement)
155149
return WObj.setFocusedElement((com.gargoylesoftware.htmlunit.html.HtmlElement)newElement.WrappedObject);
156150
}
157151

158-
// Generating method code for executeJavaScriptIfPossible
159-
public virtual NHtmlUnit.ScriptResult ExecuteJavaScriptIfPossible(string sourceCode, string sourceName, int startLine)
160-
{
161-
return ObjectWrapper.CreateWrapper<NHtmlUnit.ScriptResult>(WObj.executeJavaScriptIfPossible(sourceCode, sourceName, startLine));
162-
}
163-
164152
// Generating method code for getResolvedTarget
165153
public virtual string GetResolvedTarget(string elementTarget)
166154
{
167155
return WObj.getResolvedTarget(elementTarget);
168156
}
169157

158+
// Generating method code for executeJavaScriptIfPossible
159+
public virtual NHtmlUnit.ScriptResult ExecuteJavaScriptIfPossible(string sourceCode, string sourceName, int startLine)
160+
{
161+
return ObjectWrapper.CreateWrapper<NHtmlUnit.ScriptResult>(WObj.executeJavaScriptIfPossible(sourceCode, sourceName, startLine));
162+
}
163+
170164
// Generating method code for getHtmlElementById
171165
public virtual NHtmlUnit.Html.HtmlElement GetHtmlElementById(string id)
172166
{
@@ -326,6 +320,12 @@ public virtual void WriteInParsedStream(string stringArg)
326320
WObj.writeInParsedStream(stringArg);
327321
}
328322

323+
// Generating method code for save
324+
public virtual void Save(java.io.File file)
325+
{
326+
WObj.save(file);
327+
}
328+
329329
}
330330

331331

‎app/NHtmlUnit/Generated/Html/HtmlSelect.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@ public System.String OriginalName
148148
}
149149
}
150150

151-
public ICollection<System.String> PreviousNames
151+
public ICollection<System.String> NewNames
152152
{
153153
get
154154
{
155155
return new ShallowCollectionWrapper<System.String>(
156-
WObj.getPreviousNames());
156+
WObj.getNewNames());
157157
}
158158
}
159159
// Generating method code for isMultipleSelectEnabled

‎app/NHtmlUnit/Generated/Html/HtmlTextArea.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ public System.String OriginalName
188188
}
189189
}
190190

191-
public ICollection<System.String> PreviousNames
191+
public ICollection<System.String> NewNames
192192
{
193193
get
194194
{
195195
return new ShallowCollectionWrapper<System.String>(
196-
WObj.getPreviousNames());
196+
WObj.getNewNames());
197197
}
198198
}
199199
// Generating method code for reset

‎app/NHtmlUnit/Generated/Html/IFormFieldWithNameHistory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace NHtmlUnit.Html
1414
public interface IFormFieldWithNameHistory : NHtmlUnit.IObjectWrapper
1515
{
1616
System.String OriginalName { get; }
17-
ICollection<System.String> PreviousNames { get; }
17+
ICollection<System.String> NewNames { get; }
1818

1919
}
2020
}

0 commit comments

Comments
 (0)