Menu
▾
▴
[Azsmrc-commits] SF.net SVN: azsmrc: [813] azsmrcplugins/trunk/lbms/plugins/scanerss/main
|
From: <dam...@us...> - 2006-07-28 19:19:58
|
Revision: 813 Author: damokles Date: 2006-07-28 12:19:50 -0700 (Fri, 28 Jul 2006) ViewCVS: http://svn.sourceforge.net/azsmrc/?rev=813&view=rev Log Message: ----------- added Requested Features, commons-codec.jar is now required Modified Paths: -------------- azsmrcplugins/trunk/lbms/plugins/scanerss/main/GUI.java azsmrcplugins/trunk/lbms/plugins/scanerss/main/RSSFeed.java Modified: azsmrcplugins/trunk/lbms/plugins/scanerss/main/GUI.java =================================================================== --- azsmrcplugins/trunk/lbms/plugins/scanerss/main/GUI.java 2006-07-28 19:05:16 UTC (rev 812) +++ azsmrcplugins/trunk/lbms/plugins/scanerss/main/GUI.java 2006-07-28 19:19:50 UTC (rev 813) @@ -19,7 +19,6 @@ import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.custom.ScrolledComposite; -import org.eclipse.swt.custom.TableEditor; import org.eclipse.swt.events.ControlAdapter; import org.eclipse.swt.events.ControlEvent; import org.eclipse.swt.events.ControlListener; @@ -31,7 +30,6 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -45,7 +43,6 @@ import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.ToolBar; @@ -1276,9 +1273,9 @@ Label referrerLabel = new Label(advGroup, SWT.NULL); referrerLabel.setText("Referrer:"); - final Text referrer = new Text(advGroup, SWT.SINGLE | SWT.BORDER); + final Text referer = new Text(advGroup, SWT.SINGLE | SWT.BORDER); gridData = new GridData(GridData.FILL_HORIZONTAL); - referrer.setLayoutData(gridData); + referer.setLayoutData(gridData); Label userAgentLabel = new Label(advGroup, SWT.NULL); @@ -1338,6 +1335,32 @@ } catch (MalformedURLException e) { e.printStackTrace(); } + + if (username.getText().equals("")) + foSelectedFeed.setUsername(null); + else + foSelectedFeed.setUsername(username.getText()); + + if (password.getText().equals("")) + foSelectedFeed.setPassword(null); + else + foSelectedFeed.setPassword(password.getText()); + + if (userAgent.getText().equals("")) + foSelectedFeed.setUserAgent(null); + else + foSelectedFeed.setUserAgent(userAgent.getText()); + + if (referer.getText().equals("")) + foSelectedFeed.setReferer(null); + else + foSelectedFeed.setReferer(referer.getText()); + + if (cookie.getText().equals("")) + foSelectedFeed.setCookie(null); + else + foSelectedFeed.setCookie(cookie.getText()); + updateFeedTreeAndTable(true); } else { @@ -1366,6 +1389,32 @@ mb.open(); foUpdateInterval.setText(String.valueOf(uInterval/60)); } + + if (username.getText().equals("")) + feed.setUsername(null); + else + feed.setUsername(username.getText()); + + if (password.getText().equals("")) + feed.setPassword(null); + else + feed.setPassword(password.getText()); + + if (userAgent.getText().equals("")) + feed.setUserAgent(null); + else + feed.setUserAgent(userAgent.getText()); + + if (referer.getText().equals("")) + feed.setReferer(null); + else + feed.setReferer(referer.getText()); + + if (cookie.getText().equals("")) + feed.setCookie(null); + else + feed.setCookie(cookie.getText()); + feed.setUpdateInterval(uInterval); feedManager.addFeed(feed); foSelectedFeed = feed; Modified: azsmrcplugins/trunk/lbms/plugins/scanerss/main/RSSFeed.java =================================================================== --- azsmrcplugins/trunk/lbms/plugins/scanerss/main/RSSFeed.java 2006-07-28 19:05:16 UTC (rev 812) +++ azsmrcplugins/trunk/lbms/plugins/scanerss/main/RSSFeed.java 2006-07-28 19:19:50 UTC (rev 813) @@ -1,6 +1,3 @@ -/** - * - */ package lbms.plugins.scanerss.main; import java.io.IOException; @@ -12,6 +9,7 @@ import java.util.Vector; import java.util.zip.GZIPInputStream; +import org.apache.commons.codec.binary.Base64; import org.jdom.DataConversionException; import org.jdom.Document; import org.jdom.Element; @@ -32,6 +30,10 @@ public static final int TYPE_ATOM = 4; private String userAgent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.8.0.2) Gecko/20060308 Firefox/1.5.0.2"; + private String referer; + private String cookie; + private String username; + private String password; private String name; private URL sourceURL; @@ -62,6 +64,11 @@ } this.name = e.getAttributeValue("name"); this.active = Boolean.parseBoolean(e.getAttributeValue("active")); + userAgent = e.getAttributeValue("userAgent"); + referer = e.getAttributeValue("referer"); + cookie = e.getAttributeValue("cookie"); + username = e.getAttributeValue("username"); + password = e.getAttributeValue("password"); try { this.id = e.getAttribute("id").getIntValue(); this.lastUpdate = e.getAttribute("lastUpdate").getLongValue(); @@ -161,6 +168,76 @@ } /** + * @return the cookie + */ + public String getCookie() { + return cookie; + } + + /** + * @param cookie the cookie to set + */ + public void setCookie(String cookie) { + this.cookie = cookie; + } + + /** + * @return the password + */ + public String getPassword() { + return password; + } + + /** + * @param password the password to set + */ + public void setPassword(String password) { + this.password = password; + } + + /** + * @return the referer + */ + public String getReferer() { + return referer; + } + + /** + * @param referer the referer to set + */ + public void setReferer(String referer) { + this.referer = referer; + } + + /** + * @return the userAgent + */ + public String getUserAgent() { + return userAgent; + } + + /** + * @param userAgent the userAgent to set + */ + public void setUserAgent(String userAgent) { + this.userAgent = userAgent; + } + + /** + * @return the username + */ + public String getUsername() { + return username; + } + + /** + * @param username the username to set + */ + public void setUsername(String username) { + this.username = username; + } + + /** * @param updateInterval the updateInterval to set */ public void setUpdateInterval(int updateInterval) { @@ -175,6 +252,17 @@ e.setAttribute("lastUpdate", Long.toString(lastUpdate)); e.setAttribute("updateInterval", Integer.toString(updateInterval)); e.setAttribute("active", Boolean.toString(active)); + if (userAgent != null) + e.setAttribute("userAgent",userAgent); + if (referer != null) + e.setAttribute("referer",referer); + if (cookie != null) + e.setAttribute("cookie",cookie); + if (username != null) + e.setAttribute("username",username); + if (password != null) + e.setAttribute("password",password); + return e; } @@ -196,7 +284,14 @@ URLConnection connection = sourceURL.openConnection(); connection.setDoInput(true); connection.setRequestProperty("Accept-encoding", "gzip"); - connection.addRequestProperty("User-Agent", userAgent); + if (userAgent != null) + connection.addRequestProperty("User-Agent", userAgent); + if (username != null && password != null) + connection.addRequestProperty("Authorization", "Basic: "+(new String(new Base64().encode((username+":"+password).getBytes("8859_1"))))); + if (referer != null) + connection.addRequestProperty("Referer", referer); + if (cookie != null) + connection.addRequestProperty("Cookie", cookie); connection.connect(); String gzip = connection.getHeaderField("Content-encoding"); is = connection.getInputStream(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |