Menu
▾
▴
azureus-commitlog — Vuze commit logs
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(922) |
Jun
(830) |
Jul
(576) |
Aug
(256) |
Sep
(748) |
Oct
(704) |
Nov
(683) |
Dec
(502) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(721) |
Feb
(802) |
Mar
(787) |
Apr
(478) |
May
(519) |
Jun
(483) |
Jul
(419) |
Aug
(274) |
Sep
(525) |
Oct
(540) |
Nov
(590) |
Dec
(897) |
| 2006 |
Jan
(712) |
Feb
(909) |
Mar
(597) |
Apr
(279) |
May
(392) |
Jun
(487) |
Jul
(951) |
Aug
(254) |
Sep
(199) |
Oct
(281) |
Nov
(612) |
Dec
(525) |
| 2007 |
Jan
(606) |
Feb
(409) |
Mar
(435) |
Apr
(153) |
May
(597) |
Jun
(461) |
Jul
(644) |
Aug
(444) |
Sep
(613) |
Oct
(223) |
Nov
(397) |
Dec
(480) |
| 2008 |
Jan
(447) |
Feb
(742) |
Mar
(352) |
Apr
(897) |
May
(1486) |
Jun
(1146) |
Jul
(720) |
Aug
(707) |
Sep
(591) |
Oct
(1006) |
Nov
(303) |
Dec
(354) |
| 2009 |
Jan
(600) |
Feb
(358) |
Mar
(619) |
Apr
(286) |
May
(22) |
Jun
(88) |
Jul
(409) |
Aug
(251) |
Sep
(315) |
Oct
(549) |
Nov
(373) |
Dec
(303) |
| 2010 |
Jan
(428) |
Feb
(280) |
Mar
(524) |
Apr
(74) |
May
(217) |
Jun
(341) |
Jul
(311) |
Aug
(201) |
Sep
(213) |
Oct
(217) |
Nov
(153) |
Dec
(91) |
| 2011 |
Jan
(204) |
Feb
(139) |
Mar
(103) |
Apr
(31) |
May
(21) |
Jun
(4) |
Jul
(28) |
Aug
(22) |
Sep
(68) |
Oct
(10) |
Nov
(27) |
Dec
(30) |
| 2012 |
Jan
(56) |
Feb
(24) |
Mar
(55) |
Apr
(27) |
May
(54) |
Jun
(203) |
Jul
(130) |
Aug
(76) |
Sep
(140) |
Oct
(156) |
Nov
(116) |
Dec
(82) |
| 2013 |
Jan
(125) |
Feb
(151) |
Mar
(151) |
Apr
(158) |
May
(169) |
Jun
(111) |
Jul
(113) |
Aug
(142) |
Sep
(268) |
Oct
(232) |
Nov
(118) |
Dec
(112) |
| 2014 |
Jan
(160) |
Feb
(64) |
Mar
(192) |
Apr
(167) |
May
(213) |
Jun
(188) |
Jul
(55) |
Aug
(49) |
Sep
(127) |
Oct
(209) |
Nov
(185) |
Dec
(203) |
| 2015 |
Jan
(135) |
Feb
(181) |
Mar
(236) |
Apr
(220) |
May
(81) |
Jun
(125) |
Jul
(110) |
Aug
(88) |
Sep
(130) |
Oct
(139) |
Nov
(148) |
Dec
(63) |
| 2016 |
Jan
(88) |
Feb
(90) |
Mar
(181) |
Apr
(100) |
May
(98) |
Jun
(49) |
Jul
(27) |
Aug
(79) |
Sep
(64) |
Oct
(132) |
Nov
(113) |
Dec
(88) |
| 2017 |
Jan
(130) |
Feb
(129) |
Mar
(73) |
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(10) |
Oct
(3) |
Nov
(6) |
Dec
|
| 2018 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <liviu@vu...> - 2018-02-16 13:03:44
|
Revision: 44258
Author: liviu
Date: 2018-02-16 13:03:42 +0000 (Fri, 16 Feb 2018)
Log Message:
-----------
Fix: Plus users are not required to restart vuze to have the ads disabled.
Modified Paths:
--------------
sfweb/plugins/details/azpromo.php
Added Paths:
-----------
sfweb/plugins/azpromo_2.6.vuze
sfweb/plugins/azpromo_2.6.zip
Added: sfweb/plugins/azpromo_2.6.vuze
===================================================================
(Binary files differ)
Index: sfweb/plugins/azpromo_2.6.vuze
===================================================================
--- sfweb/plugins/azpromo_2.6.vuze 2017-11-03 14:25:54 UTC (rev 44257)
+++ sfweb/plugins/azpromo_2.6.vuze 2018-02-16 13:03:42 UTC (rev 44258)
Property changes on: sfweb/plugins/azpromo_2.6.vuze
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: sfweb/plugins/azpromo_2.6.zip
===================================================================
(Binary files differ)
Index: sfweb/plugins/azpromo_2.6.zip
===================================================================
--- sfweb/plugins/azpromo_2.6.zip 2017-11-03 14:25:54 UTC (rev 44257)
+++ sfweb/plugins/azpromo_2.6.zip 2018-02-16 13:03:42 UTC (rev 44258)
Property changes on: sfweb/plugins/azpromo_2.6.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: sfweb/plugins/details/azpromo.php
===================================================================
--- sfweb/plugins/details/azpromo.php 2017-11-03 14:25:54 UTC (rev 44257)
+++ sfweb/plugins/details/azpromo.php 2018-02-16 13:03:42 UTC (rev 44258)
@@ -10,6 +10,9 @@
$versions = array(
+ new PluginVersionInfo( "5.7.2.0", "2.6", "plugins/azpromo_2.6.zip", "plugins/azpromo_2.6.zip",
+ "2.6: Fix: Plus users are not required to restart vuze to have the ads disabled." ),
+
new PluginVersionInfo( "5.7.2.0", "2.5", "plugins/azpromo_2.5.zip", "plugins/azpromo_2.5.zip",
"2.5: Fixed how views are added/removed and how events are being sent." ),
@@ -46,7 +49,7 @@
if ( $compare >= 0 ){
$cvs_version =
- new PluginVersionInfo( "5.7.1.1", "2.5_CVS", "plugins/azpromo_2.5.zip", "plugins/azpromo_2.5.zip",
+ new PluginVersionInfo( "5.7.1.1", "2.6_CVS", "plugins/azpromo_2.6.zip", "plugins/azpromo_2.6.zip",
"" );
}
|
|
From: <liviu@vu...> - 2017-11-03 14:26:01
|
Revision: 44257
Author: liviu
Date: 2017-11-03 14:25:54 +0000 (Fri, 03 Nov 2017)
Log Message:
-----------
Tag 5.7.6.0 release
Added Paths:
-----------
client/tags/RELEASE_5760/
|
|
From: <liviu@vu...> - 2017-11-02 16:19:37
|
Revision: 44256
Author: liviu
Date: 2017-11-02 16:19:29 +0000 (Thu, 02 Nov 2017)
Log Message:
-----------
release of 5.7.6.0
Modified Paths:
--------------
sfweb/chlogs/ChangeLog.txt
sfweb/versions.php
Modified: sfweb/chlogs/ChangeLog.txt
===================================================================
--- sfweb/chlogs/ChangeLog.txt 2017-11-02 16:01:05 UTC (rev 44255)
+++ sfweb/chlogs/ChangeLog.txt 2017-11-02 16:19:29 UTC (rev 44256)
@@ -1,9 +1,47 @@
VUZE CHANGELOG
-----------------
-VUZE CHANGELOG
------------------
+2017.10.30 | Vuze 5.7.6.0
+FEATURE: UI | Classic friends meets dchat! [Parg]
+FEATURE: UI | Handle alt networks [Parg]
+FEATURE: UI | Option to chat about torrent errors [Parg]
+FEATURE: UI | Option to hide auto-generated messages [Parg]
+FEATURE: UI | Added option to move torrent on tag-move-on-complete [Parg]
+
+FEATURE: Core | Option to categorise friend connections as lan-local for rate limiting purposes [Parg]
+FEATURE: Core | Support some alternative chats [Parg]
+FEATURE: Core | Torrent location support for initial save location and copy-on-complete [Parg]
+FEATURE: Core | Added json import [Parg]
+FEATURE: Core | I2P: install on attempted dns resolution [Parg]
+
+CHANGE: UI | Remove ConfigView.section.style.swt.library.selection [TuxPaper]
+CHANGE: UI | Basque translation update [Azpidatziak]
+CHANGE: UI | Double click actions for search+subs views [Parg]
+CHANGE: UI | Made menus more consistent [Parg]
+CHANGE: UI | Added 'date added to tag' column [Parg]
+CHANGE: UI | Added order setting to tag limit removal - values 'time [Parg]
+CHANGE: UI | Added to vuze' and 'time added to tag' [Parg]
+CHANGE: UI | Brazilian Portuguese translation update [Havokdan]
+CHANGE: UI | Norwegian translation update [Lislegard]
+
+CHANGE: Core | Added option for LAN/WAN nets [Parg]
+CHANGE: Core | Added option for buddy-boosting when both peers incomplete [Parg]
+CHANGE: Core | Improve link parsing [Parg]
+CHANGE: Core | Reworked location change logic to support independent data and torrent movements [Parg]
+CHANGE: Core | Added tag option to file movement to allow separate control over data and torrent [Parg]
+CHANGE: Core | Bring back ability to update subscription filters [Parg]
+CHANGE: Core | Added a 'tag_age' constraint variable [Parg]
+
+BUGFIX: UI | Fix NPE that causes thread hang [Parg]
+BUGFIX: UI | Torrent link needs reconstructing in some cases [Parg]
+
+BUGFIX: Core | Defer constraint application until restore-from-archive is complete to ensure that tags are appropriately applied [Parg]
+BUGFIX: Core | Various fixes around non-public singletons [Parg]
+BUGFIX: Core | Don't try inaccessible default constructor for built-in platform managers [Parg]
+BUGFIX: Core | Only record addition time for persistent tag types [Parg]
+BUGFIX: Core | Check limits more frequently; added a hack to allow tags to have a max of 0 entries [Parg]
+
2017.02.28 | Vuze 5.7.5.0
FEATURE: UI | Native search results view [Parg;TuxPaper]
Modified: sfweb/versions.php
===================================================================
--- sfweb/versions.php 2017-11-02 16:01:05 UTC (rev 44255)
+++ sfweb/versions.php 2017-11-02 16:19:29 UTC (rev 44256)
@@ -1,6 +1,6 @@
<?php
-$latest_3_0_release = "5.7.5.0";
-$latest_CVS = "5.7.5.1_CVS";
+$latest_3_0_release = "5.7.6.0";
+$latest_CVS = "5.7.6.1_CVS";
$versions = array(
"2.0.3.2",
"2.0.4.0",
@@ -90,6 +90,7 @@
"5.7.3.0",
"5.7.4.0",
"5.7.5.0",
+ "5.7.6.0",
$latest_CVS
);
|
|
From: <betasnap@vu...> - 2017-11-02 16:07:01
|
A new [trunk] Vuze Client snapshot [ Vuze_5.7.6.1-01 ] has been released on (02 Nov 2017 04:04:50 PM) and is available at: * http://dev.vuze.com * http://cf1.vuze.com/torrent/files/Azureus5.7.6.1-B01.jar * http://cf1.vuze.com/torrent/torrents/Azureus5.7.6.1-B01.jar.torrent ==== CHANGELOG [ Vuze_5.7.6.1-01 ] http://svn.vuze.com/public/client/trunk/ ===== 2017-11-02 16:01 liviu * [r44255] /client/trunk/azureus2/src/ChangeLog.txt, /client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java: prep 5.7.6.1 ### |
|
From: <liviu@vu...> - 2017-11-02 16:01:14
|
Revision: 44255
Author: liviu
Date: 2017-11-02 16:01:05 +0000 (Thu, 02 Nov 2017)
Log Message:
-----------
prep 5.7.6.1
Modified Paths:
--------------
client/trunk/azureus2/src/ChangeLog.txt
client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java
Modified: client/trunk/azureus2/src/ChangeLog.txt
===================================================================
--- client/trunk/azureus2/src/ChangeLog.txt 2017-10-27 12:17:44 UTC (rev 44254)
+++ client/trunk/azureus2/src/ChangeLog.txt 2017-11-02 16:01:05 UTC (rev 44255)
@@ -1,5 +1,6 @@
VUZE CHANGELOG
-----------------
+2017.xx.yy | Vuze 5.7.6.1
2017.10.30 | Vuze 5.7.6.0
Modified: client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java
===================================================================
--- client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java 2017-10-27 12:17:44 UTC (rev 44254)
+++ client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java 2017-11-02 16:01:05 UTC (rev 44255)
@@ -140,7 +140,7 @@
public static final String AZUREUS_NAME = "Azureus";
public static final String AZUREUS_PROTOCOL_NAME_PRE_4813 = "Azureus";
public static final String AZUREUS_PROTOCOL_NAME = "Vuze";
- public static final String AZUREUS_VERSION = "5.7.6.0";
+ public static final String AZUREUS_VERSION = "5.7.6.1";
public static final String BUILD_VERSION = "@build.version@"; //Ant replace
public static final String AZUREUS_SUBVER = "";
public static final byte[] VERSION_ID = ("-" + "AZ" + AZUREUS_VERSION.replace(".","") + "-").getBytes(); //MUST be 8 chars long!
|
|
From: <betasnap@vu...> - 2017-11-02 15:41:29
|
A new [trunk] Vuze Client snapshot [ Vuze_5.7.6.0-01 ] has been released on (02 Nov 2017 03:39:19 PM) and is available at: * http://dev.vuze.com * http://cf1.vuze.com/torrent/files/Azureus5.7.6.0-B01.jar * http://cf1.vuze.com/torrent/torrents/Azureus5.7.6.0-B01.jar.torrent ==== CHANGELOG [ Vuze_5.7.6.0-01 ] http://svn.vuze.com/public/client/trunk/ ===== svn: E160006: No such revision 44255 -:3: parser error : Premature end of data in tag log line 2 unable to parse - ### |
|
From: <betasnap@vu...> - 2017-11-02 15:33:24
|
A new [trunk] Vuze Client snapshot [ Vuze_5.7.6.0-01 ] has been released on (02 Nov 2017 03:31:14 PM) and is available at: * http://dev.vuze.com * http://cf1.vuze.com/torrent/files/Azureus5.7.6.0-B01.jar * http://cf1.vuze.com/torrent/torrents/Azureus5.7.6.0-B01.jar.torrent ==== CHANGELOG [ Vuze_5.7.6.0-01 ] http://svn.vuze.com/public/client/trunk/ ===== /vuze/com/app/hudson/clientsnap/svn2cl/svn2cl.sh: 313: /vuze/com/app/hudson/clientsnap/svn2cl/svn2cl.sh: xsltproc: not found svn: E000032: Write error: Broken pipe ### |
|
From: <liviu@vu...> - 2017-10-27 12:17:53
|
Revision: 44254
Author: liviu
Date: 2017-10-27 12:17:44 +0000 (Fri, 27 Oct 2017)
Log Message:
-----------
Prepared for a new version release
Add changes to ChangeLog
Modified Paths:
--------------
client/trunk/azureus2/src/ChangeLog.txt
client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java
Modified: client/trunk/azureus2/src/ChangeLog.txt
===================================================================
--- client/trunk/azureus2/src/ChangeLog.txt 2017-10-03 13:39:16 UTC (rev 44253)
+++ client/trunk/azureus2/src/ChangeLog.txt 2017-10-27 12:17:44 UTC (rev 44254)
@@ -1,8 +1,47 @@
VUZE CHANGELOG
-----------------
-2017.xx.yy | Vuze 5.7.5.1
+2017.10.30 | Vuze 5.7.6.0
+FEATURE: UI | Classic friends meets dchat! [Parg]
+FEATURE: UI | Handle alt networks [Parg]
+FEATURE: UI | Option to chat about torrent errors [Parg]
+FEATURE: UI | Option to hide auto-generated messages [Parg]
+FEATURE: UI | Added option to move torrent on tag-move-on-complete [Parg]
+
+FEATURE: Core | Option to categorise friend connections as lan-local for rate limiting purposes [Parg]
+FEATURE: Core | Support some alternative chats [Parg]
+FEATURE: Core | Torrent location support for initial save location and copy-on-complete [Parg]
+FEATURE: Core | Added json import [Parg]
+FEATURE: Core | I2P: install on attempted dns resolution [Parg]
+
+CHANGE: UI | Remove ConfigView.section.style.swt.library.selection [TuxPaper]
+CHANGE: UI | Basque translation update [Azpidatziak]
+CHANGE: UI | Double click actions for search+subs views [Parg]
+CHANGE: UI | Made menus more consistent [Parg]
+CHANGE: UI | Added 'date added to tag' column [Parg]
+CHANGE: UI | Added order setting to tag limit removal - values 'time [Parg]
+CHANGE: UI | Added to vuze' and 'time added to tag' [Parg]
+CHANGE: UI | Brazilian Portuguese translation update [Havokdan]
+CHANGE: UI | Norwegian translation update [Lislegard]
+
+CHANGE: Core | Added option for LAN/WAN nets [Parg]
+CHANGE: Core | Added option for buddy-boosting when both peers incomplete [Parg]
+CHANGE: Core | Improve link parsing [Parg]
+CHANGE: Core | Reworked location change logic to support independent data and torrent movements [Parg]
+CHANGE: Core | Added tag option to file movement to allow separate control over data and torrent [Parg]
+CHANGE: Core | Bring back ability to update subscription filters [Parg]
+CHANGE: Core | Added a 'tag_age' constraint variable [Parg]
+
+BUGFIX: UI | Fix NPE that causes thread hang [Parg]
+BUGFIX: UI | Torrent link needs reconstructing in some cases [Parg]
+
+BUGFIX: Core | Defer constraint application until restore-from-archive is complete to ensure that tags are appropriately applied [Parg]
+BUGFIX: Core | Various fixes around non-public singletons [Parg]
+BUGFIX: Core | Don't try inaccessible default constructor for built-in platform managers [Parg]
+BUGFIX: Core | Only record addition time for persistent tag types [Parg]
+BUGFIX: Core | Check limits more frequently; added a hack to allow tags to have a max of 0 entries [Parg]
+
2017.02.28 | Vuze 5.7.5.0
FEATURE: UI | Native search results view [Parg;TuxPaper]
Modified: client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java
===================================================================
--- client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java 2017-10-03 13:39:16 UTC (rev 44253)
+++ client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java 2017-10-27 12:17:44 UTC (rev 44254)
@@ -140,7 +140,7 @@
public static final String AZUREUS_NAME = "Azureus";
public static final String AZUREUS_PROTOCOL_NAME_PRE_4813 = "Azureus";
public static final String AZUREUS_PROTOCOL_NAME = "Vuze";
- public static final String AZUREUS_VERSION = "5.7.5.1";
+ public static final String AZUREUS_VERSION = "5.7.6.0";
public static final String BUILD_VERSION = "@build.version@"; //Ant replace
public static final String AZUREUS_SUBVER = "";
public static final byte[] VERSION_ID = ("-" + "AZ" + AZUREUS_VERSION.replace(".","") + "-").getBytes(); //MUST be 8 chars long!
|
|
From: <liviu@vu...> - 2017-10-03 13:39:25
|
Revision: 44253
Author: liviu
Date: 2017-10-03 13:39:16 +0000 (Tue, 03 Oct 2017)
Log Message:
-----------
Fixed how views are added/removed and how events are being sent.
Also, made some minor refactoring.
Modified Paths:
--------------
plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoPlugin.java
plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java
plugins/azpromo/plugin.properties
Modified: plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoPlugin.java
===================================================================
--- plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoPlugin.java 2017-10-03 13:37:30 UTC (rev 44252)
+++ plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoPlugin.java 2017-10-03 13:39:16 UTC (rev 44253)
@@ -86,29 +86,6 @@
pluginInstance = this;
}
- public String readStringFromUrl(String url) {
- StringBuffer sb = new StringBuffer();
- try {
- URL _url = new URL(url);
- HttpURLConnection con = (HttpURLConnection) _url.openConnection();
-
- InputStream is = con.getInputStream();
-
- byte[] buffer = new byte[256];
-
- int read = 0;
-
- while ((read = is.read(buffer)) != -1) {
- sb.append(new String(buffer, 0, read));
- }
- con.disconnect();
-
- } catch (Throwable e) {
-
- }
- return sb.toString();
- }
-
// @see org.gudy.azureus2.plugins.Plugin#initialize(org.gudy.azureus2.plugins.PluginInterface)
public void initialize(final PluginInterface pi) throws PluginException {
pluginInterface = pi;
@@ -126,21 +103,21 @@
checkDumps();
// COConfigurationManager.setParameter( "azpromo.dump.disable.plugin", false );
-
+
if ( COConfigurationManager.getBooleanParameter( "azpromo.dump.disable.plugin", false )){
-
+
PluginConfig pc = pluginInterface.getPluginconfig();
-
+
if ( !pc.getPluginStringParameter( "plugin.info", "" ).equals( "c" )){
-
+
pc.setPluginParameter( "plugin.info", "c" );
-
+
logEvent( "crashed" );
}
-
+
return;
}
-
+
if ( COConfigurationManager.getBooleanParameter( "Beta Programme Enabled" )){
// no ads for beta users unless testing with explicit pubid
@@ -181,16 +158,9 @@
if ( enabled ){
if (instance instanceof UISWTInstance && !unloaded ) {
swtInstance = ((UISWTInstance) instance);
-
- synchronized( viewLock ){
-
- if ( !didAddViewInSidebar){
-
- swtInstance.addView(UISWTInstance.VIEW_SIDEBAR_AREA, VIEWID, PromoView.class, null);
-
- didAddViewInSidebar = true;
- }
- }
+
+ addViewInSidebar();
+
}
}
}
@@ -257,21 +227,9 @@
if ( enabled ){
- if ( !didAddViewInSidebar){
-
- swtInstance.addView(UISWTInstance.VIEW_SIDEBAR_AREA, VIEWID, PromoView.class, null);
-
- didAddViewInSidebar = true;
- }
+ addViewInSidebar();
}else{
- if (didAddViewInSidebar){
-
- swtInstance.removeViews( UISWTInstance.VIEW_SIDEBAR_AREA, VIEWID );
-
- didAddViewInSidebar = false;
-
- PromoPlugin.logEvent("goaway");
- }
+ removeViewInSidebar();
}
}
}
@@ -279,6 +237,32 @@
});
}
+ protected void addViewInSidebar() {
+ synchronized (viewLock) {
+
+ if (!didAddViewInSidebar) {
+
+ swtInstance.addView(UISWTInstance.VIEW_SIDEBAR_AREA, VIEWID, PromoView.class, null);
+
+ didAddViewInSidebar = true;
+ }
+ }
+ }
+
+ protected void removeViewInSidebar() {
+ synchronized (viewLock) {
+
+ if (didAddViewInSidebar) {
+
+ swtInstance.removeViews(UISWTInstance.VIEW_SIDEBAR_AREA, VIEWID);
+
+ didAddViewInSidebar = false;
+
+ PromoPlugin.logEvent("goaway");
+ }
+ }
+ }
+
protected void checkLicence() {
boolean hasLicence = FeatureUtils.hasPlusLicence() || FeatureUtils.hasNoAdLicence();
@@ -542,8 +526,4 @@
return( pluginInstance );
}
- protected List<PromoView> getViews(){
- return new ArrayList<>(views);
- }
-
}
Modified: plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java
===================================================================
--- plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java 2017-10-03 13:37:30 UTC (rev 44252)
+++ plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java 2017-10-03 13:39:16 UTC (rev 44253)
@@ -23,8 +23,8 @@
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.logging.Handler;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
@@ -64,7 +64,7 @@
public class PromoView
implements UISWTViewEventListener
{
- private static final String URL_JSON = "http://client.vuze.com/donation/sidebar_promo.php?ver=2.4";;
+ private static final String URL_JSON = "http://client.vuze.com/donation/sidebar_promo.php?ver=2.5";;
private static final String DEFAULT_INHOUSE_HTML = "<html><body style=\"overflow:hidden; margin:100px 10px;\"><p>Please <a target=\"_BLANK\" href=\"http://www.vuze.com/donation/donate.php?sourceRef=sidebarpromo\">Donate</a></BODY></html>";;
@@ -78,8 +78,10 @@
private Map mapJSON;
- private TimerEvent timeEvent_inHouse;
+ private static TimerEvent timeEvent_inHouse;
+ private static Map<String, Map.Entry<Date, String>> urlToLastResult = new HashMap<>();
+
public PromoView() {
plugin = PromoPlugin.getPlugin();
}
@@ -121,21 +123,7 @@
private void initialize(Composite parent, final UISWTView view) {
this.view = view;
- try {
- PluginConfig config = plugin.getPluginInterface().getPluginconfig();
- if (!config.getPluginBooleanParameter("resized.once")) {
- config.setPluginParameter("resized.once", true);
- boolean visible = SideBar.instance.isVisible();
- if (visible) {
- final SWTSkinObjectSash soSash = (SWTSkinObjectSash) SideBar.instance.getSkin().getSkinObject(
- "sidebar-sash");
- if (soSash != null && soSash.getAboveSize() < 300) {
- soSash.setAboveSize(300);
- }
- }
- }
- } catch (Throwable t) {
- }
+ configureInitialPluginSize();
final Composite ourParent = parent;
@@ -147,180 +135,218 @@
fd.left = null;
fd.right.offset = -3;
- final Label lblClose = new Label(ourParent, SWT.NONE);
- lblClose.setText("x");
- lblClose.setCursor(lblClose.getDisplay().getSystemCursor(SWT.CURSOR_HAND));
- lblClose.setLayoutData(fd);
- lblClose.addMouseListener(new MouseListener() {
+ final Label lblClose = createCloseLabel(ourParent, fd);
- public void mouseUp(MouseEvent e) {
- temporaryClose();
- }
+ final Label lblText = createPlusLabel(ourParent);
- public void mouseDown(MouseEvent e) {
- }
+ configureLogger();
- public void mouseDoubleClick(MouseEvent e) {
- }
- });
+ Browser theirBrowser = findBrowser( ourParent );
+ listenOnLocationChangeFor(theirBrowser);
- final Label lblText = new Label(ourParent, SWT.NONE);
- lblText.setText("Plus Users Don't See Ads");
- lblText.setFont(FontUtils.getFontWithHeight(lblText.getFont(), null, 9));
- lblText.addMouseListener(new MouseListener() {
- public void mouseUp(MouseEvent e) {
- if (plugin.getPluginInterface() == null) {
- return;
- }
+ adBrowser = new Browser(ourParent, SWT.NO_SCROLL);
+ listenBrowserOnWindowOpenFor(ourParent);
- plugin.getPluginInterface().getUtilities().createThread("LoadPromo",
- new Runnable() {
+ fd = Utils.getFilledFormData();
+ fd.height = 254;
+ fd.top = new FormAttachment(lblClose, 2);
+ adBrowser.setLayoutData(fd);
+ fd = Utils.getFilledFormData();
+ fd.bottom = new FormAttachment(adBrowser, -1);
+ fd.top = null;
+ fd.right = null;
+ fd.left.offset = 3;
+ lblText.setLayoutData(fd);
+
+ ourParent.getShell().layout(true, true);
+
+ plugin.getPluginInterface().getUtilities().createThread("pv",
+ new Runnable() {
public void run() {
- try {
- log("loadclick");
- loadInHouse();
- } catch (Throwable t) {
- }
+ loadInHouse();
}
});
- }
- public void mouseDown(MouseEvent e) {
- }
+ }
- public void mouseDoubleClick(MouseEvent e) {
+ private void listenBrowserOnWindowOpenFor(Composite ourParent) {
+ adBrowser.addOpenWindowListener(new OpenWindowListener() {
+ public void open(WindowEvent event) {
+ final BrowserWrapper subBrowser = Utils.createSafeBrowser(ourParent,
+ Utils.getInitialBrowserStyle(SWT.NONE));
+ subBrowser.addLocationListener(new LocationListener() {
+ public void changed(LocationEvent arg0) {
+ }
+
+ public void changing(LocationEvent event) {
+ if (event.location == null || !event.location.startsWith("http")) {
+ return;
+ }
+ event.doit = false;
+ Utils.launch(event.location);
+
+ Utils.execSWTThreadLater(1000, new AERunnable() {
+ public void runSupport() {
+ subBrowser.dispose();
+ }
+ });
+ }
+ });
+ subBrowser.setBrowser(event);
}
});
+ }
-
+ private void listenOnLocationChangeFor(Browser theirBrowser) {
+ if ( theirBrowser != null ){
+
+ theirBrowser.addLocationListener(new LocationListener() {
+ public void changed(LocationEvent arg0) {
+ }
+
+ public void changing(LocationEvent event) {
+
+ String str = String.valueOf( event );
+
+ if ( str.contains( "://mono.vizu.com" )){
+
+ event.doit = false;
+ }
+
+ if ( Constants.getCurrentVersion().endsWith( "_CVS" )){
+
+ log( str );
+ }
+ }
+ });
+ }
+ }
+
+ private void configureLogger() {
Logger logger = Logger.getLogger( "com.appadx.adcontrol" );
-
+
logger.setUseParentHandlers( false );
-
+
//Logger.getLogger( "com.appadx.adcontrol" ).setLevel(Level.OFF);
-
+
logger.addHandler(
new Handler() {
-
+
@Override
- public void
- publish( LogRecord record )
+ public void
+ publish( LogRecord record )
{
String text = new SimpleFormatter().format(record).trim();
-
+
text = text.replace( '\r', ' ' );
text = text.replace( '\n', ' ' );
-
+
text = text.replaceAll( " ", " " );
-
+
log( text);
}
-
+
@Override
public void flush() {
// TODO Auto-generated method stub
-
+
}
-
+
@Override
public void close() {
// TODO Auto-generated method stub
-
+
}
});
+ }
- Browser theirBrowser = findBrowser( ourParent );
-
- if ( theirBrowser != null ){
-
- theirBrowser.addLocationListener(new LocationListener() {
- public void changed(LocationEvent arg0) {
- }
+ private Label createPlusLabel(Composite ourParent) {
+ final Label lblText = new Label(ourParent, SWT.NONE);
+ lblText.setText("Plus Users Don't See Ads");
+ lblText.setFont(FontUtils.getFontWithHeight(lblText.getFont(), null, 9));
+ lblText.addMouseListener(new MouseListener() {
- public void changing(LocationEvent event) {
-
- String str = String.valueOf( event );
-
- if ( str.contains( "://mono.vizu.com" )){
-
- event.doit = false;
- }
-
- if ( Constants.getCurrentVersion().endsWith( "_CVS" )){
-
- log( str );
- }
+ public void mouseUp(MouseEvent e) {
+ if (plugin.getPluginInterface() == null) {
+ return;
}
- });
- }
+ plugin.getPluginInterface().getUtilities().createThread("LoadPromo",
+ new Runnable() {
- adBrowser = new Browser(ourParent, SWT.NO_SCROLL);
- adBrowser.addOpenWindowListener(new OpenWindowListener() {
- public void open(WindowEvent event) {
- final BrowserWrapper subBrowser = Utils.createSafeBrowser(ourParent,
- Utils.getInitialBrowserStyle(SWT.NONE));
- subBrowser.addLocationListener(new LocationListener() {
- public void changed(LocationEvent arg0) {
- }
-
- public void changing(LocationEvent event) {
- if (event.location == null || !event.location.startsWith("http")) {
- return;
+ public void run() {
+ try {
+ log("loadclick");
+ loadInHouse();
+ } catch (Throwable t) {
}
- event.doit = false;
- Utils.launch(event.location);
-
- Utils.execSWTThreadLater(1000, new AERunnable() {
- public void runSupport() {
- subBrowser.dispose();
- }
- });
}
});
- subBrowser.setBrowser(event);
}
+
+ public void mouseDown(MouseEvent e) {
+ }
+
+ public void mouseDoubleClick(MouseEvent e) {
+ }
});
- fd = Utils.getFilledFormData();
- fd.height = 254;
- fd.top = new FormAttachment(lblClose, 2);
- adBrowser.setLayoutData(fd);
+ return lblText;
+ }
- fd = Utils.getFilledFormData();
- fd.bottom = new FormAttachment(adBrowser, -1);
- fd.top = null;
- fd.right = null;
- fd.left.offset = 3;
- lblText.setLayoutData(fd);
+ private Label createCloseLabel(Composite ourParent, FormData fd) {
+ final Label lblClose = new Label(ourParent, SWT.NONE);
+ lblClose.setText("x");
+ lblClose.setCursor(lblClose.getDisplay().getSystemCursor(SWT.CURSOR_HAND));
+ lblClose.setLayoutData(fd);
+ lblClose.addMouseListener(new MouseListener() {
- ourParent.getShell().layout(true, true);
+ public void mouseUp(MouseEvent e) {
+ temporaryClose();
+ }
- plugin.getPluginInterface().getUtilities().createThread("pv",
- new Runnable() {
- public void run() {
- loadInHouse();
- }
- });
+ public void mouseDown(MouseEvent e) {
+ }
+ public void mouseDoubleClick(MouseEvent e) {
+ }
+ });
+ return lblClose;
}
+ private void configureInitialPluginSize() {
+ try {
+ PluginConfig config = plugin.getPluginInterface().getPluginconfig();
+ if (!config.getPluginBooleanParameter("resized.once")) {
+ config.setPluginParameter("resized.once", true);
+ boolean visible = SideBar.instance.isVisible();
+ if (visible) {
+ final SWTSkinObjectSash soSash = (SWTSkinObjectSash) SideBar.instance.getSkin().getSkinObject(
+ "sidebar-sash");
+ if (soSash != null && soSash.getAboveSize() < 300) {
+ soSash.setAboveSize(300);
+ }
+ }
+ }
+ } catch (Throwable t) {
+ }
+ }
+
protected void loadInHouse() {
if (plugin.getPluginInterface() == null) {
return;
}
- boolean first = mapJSON == null;
-
- int showEvery = 1000 * 60 * 15;
-
- String json = readStringFromUrl(URL_JSON).trim();
+ String json = readStringFromUrlOrCache(URL_JSON).trim();
+
log("Inhouse load");
mapJSON = JSONUtils.decodeJSON(json);
- if (first){
+ boolean isFirstShowKeyPresent = mapJSON == null;
+
+ if (isFirstShowKeyPresent){
int firstShowInMS = MapUtils.getMapInt(mapJSON, "first-show-ms", 0);
flipTest(firstShowInMS);
@@ -330,7 +356,7 @@
flipTest(0);
}
- showEvery = mapJSON == null ? 1000 * 60 * 15
+ int showEvery = isFirstShowKeyPresent ? 1000 * 60 * 15
: MapUtils.getMapInt(mapJSON, "show-every-ms", 1000 * 60 * 5);
if (timeEvent_inHouse != null) {
@@ -339,7 +365,7 @@
timeEvent_inHouse = SimpleTimer.addEvent("pv", SystemTime.getOffsetTime(showEvery),
new TimerEventPerformer() {
-
+
public void perform(TimerEvent event) {
loadInHouse();
}
@@ -381,7 +407,7 @@
boolean popupOnShowEvery = MapUtils.getMapBoolean(mapJSON, "popup-on-show-every", false);
if (popupOnShowEvery) {
- addViewIfNotPresent();
+ plugin.addViewInSidebar();
} else if (adBrowser == null || adBrowser.isDisposed()) {
return;
}
@@ -392,15 +418,6 @@
});
}
- private void addViewIfNotPresent() {
- List<PromoView> views = plugin.getViews();
- boolean isPromoViewAlreadyShown = views.contains(this);
- if (! isPromoViewAlreadyShown) {
- plugin.getSWTInstance().addView(UISWTInstance.VIEW_SIDEBAR_AREA, PromoPlugin.VIEWID, PromoView.class, null);
- plugin.addViewInViews(this);
- }
- }
-
protected void temporaryClose() {
if (view == null) {
return;
@@ -431,8 +448,13 @@
boolean canCloseOnX = MapUtils.getMapBoolean(mapJSON, "can-close-on-x", false);
if (canCloseOnX) {
- swtInstance.removeViews( UISWTInstance.VIEW_SIDEBAR_AREA, PromoPlugin.VIEWID );
- plugin.removeViewInViews(this);
+ plugin.removeViewInSidebar();
+ boolean popupOnShowEvery = MapUtils.getMapBoolean(mapJSON, "popup-on-show-every", false);
+ if (!popupOnShowEvery) {
+ if( timeEvent_inHouse != null ) {
+ timeEvent_inHouse.cancel();
+ }
+ }
}
}
}
@@ -473,29 +495,39 @@
});
}
- public static String readStringFromUrl(String url) {
- StringBuffer sb = new StringBuffer();
- try {
- URL _url = new URL(url);
- HttpURLConnection con = (HttpURLConnection) _url.openConnection();
- con.setConnectTimeout(30000);
- con.setReadTimeout(30000);
- InputStream is = con.getInputStream();
+ public String readStringFromUrlOrCache(String url) {
+ Map.Entry<Date, String> lastResult = urlToLastResult.get(url);
+ Date currentTime = new Date();
+ if (lastResult != null && (TimeUnit.MILLISECONDS.toSeconds(currentTime.getTime() - lastResult.getKey().getTime()))<10) {
+ return lastResult.getValue();
+ } else {
- byte[] buffer = new byte[256];
+ StringBuffer sb = new StringBuffer();
+ try {
+ URL _url = new URL(url);
+ HttpURLConnection con = (HttpURLConnection) _url.openConnection();
- int read = 0;
+ con.setConnectTimeout(30000);
+ con.setReadTimeout(30000);
+ InputStream is = con.getInputStream();
- while ((read = is.read(buffer)) != -1) {
- sb.append(new String(buffer, 0, read));
+ byte[] buffer = new byte[256];
+
+ int read = 0;
+
+ while ((read = is.read(buffer)) != -1) {
+ sb.append(new String(buffer, 0, read));
+ }
+ con.disconnect();
+
+ } catch (Throwable e) {
+ //e.printStackTrace();
}
- con.disconnect();
- } catch (Throwable e) {
- //e.printStackTrace();
+ urlToLastResult.put(url, new AbstractMap.SimpleEntry<Date, String>(new Date(), sb.toString()));
+ return sb.toString();
}
- return sb.toString();
}
}
Modified: plugins/azpromo/plugin.properties
===================================================================
--- plugins/azpromo/plugin.properties 2017-10-03 13:37:30 UTC (rev 44252)
+++ plugins/azpromo/plugin.properties 2017-10-03 13:39:16 UTC (rev 44253)
@@ -2,4 +2,4 @@
plugin.langfile=com.vuze.azureus.plugin.azpromo.internat.Messages
plugin.name=Promo View
plugin.id=azpromo
-plugin.version=2.4
+plugin.version=2.5
|
|
From: <liviu@vu...> - 2017-10-03 13:37:38
|
Revision: 44252
Author: liviu
Date: 2017-10-03 13:37:30 +0000 (Tue, 03 Oct 2017)
Log Message:
-----------
Fixed how views are added/removed and how events are being sent.
Modified Paths:
--------------
sfweb/plugins/details/azpromo.php
Added Paths:
-----------
sfweb/plugins/azpromo_2.5.vuze
sfweb/plugins/azpromo_2.5.zip
Added: sfweb/plugins/azpromo_2.5.vuze
===================================================================
(Binary files differ)
Index: sfweb/plugins/azpromo_2.5.vuze
===================================================================
--- sfweb/plugins/azpromo_2.5.vuze 2017-09-20 14:21:23 UTC (rev 44251)
+++ sfweb/plugins/azpromo_2.5.vuze 2017-10-03 13:37:30 UTC (rev 44252)
Property changes on: sfweb/plugins/azpromo_2.5.vuze
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: sfweb/plugins/azpromo_2.5.zip
===================================================================
(Binary files differ)
Index: sfweb/plugins/azpromo_2.5.zip
===================================================================
--- sfweb/plugins/azpromo_2.5.zip 2017-09-20 14:21:23 UTC (rev 44251)
+++ sfweb/plugins/azpromo_2.5.zip 2017-10-03 13:37:30 UTC (rev 44252)
Property changes on: sfweb/plugins/azpromo_2.5.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: sfweb/plugins/details/azpromo.php
===================================================================
--- sfweb/plugins/details/azpromo.php 2017-09-20 14:21:23 UTC (rev 44251)
+++ sfweb/plugins/details/azpromo.php 2017-10-03 13:37:30 UTC (rev 44252)
@@ -10,6 +10,9 @@
$versions = array(
+ new PluginVersionInfo( "5.7.2.0", "2.5", "plugins/azpromo_2.5.zip", "plugins/azpromo_2.5.zip",
+ "2.5: Fixed how views are added/removed and how events are being sent." ),
+
new PluginVersionInfo( "5.7.2.0", "2.4", "plugins/azpromo_2.4.zip", "plugins/azpromo_2.4.zip",
"2.4: Improved logging." ),
@@ -43,7 +46,7 @@
if ( $compare >= 0 ){
$cvs_version =
- new PluginVersionInfo( "5.7.1.1", "2.4_CVS", "plugins/azpromo_2.4.zip", "plugins/azpromo_2.4.zip",
+ new PluginVersionInfo( "5.7.1.1", "2.5_CVS", "plugins/azpromo_2.5.zip", "plugins/azpromo_2.5.zip",
"" );
}
|
|
From: <liviu@vu...> - 2017-09-20 14:21:32
|
Revision: 44251
Author: liviu
Date: 2017-09-20 14:21:23 +0000 (Wed, 20 Sep 2017)
Log Message:
-----------
Improved logging.
Modified Paths:
--------------
sfweb/plugins/details/azpromo.php
Added Paths:
-----------
sfweb/plugins/azpromo_2.4.vuze
sfweb/plugins/azpromo_2.4.zip
Added: sfweb/plugins/azpromo_2.4.vuze
===================================================================
(Binary files differ)
Index: sfweb/plugins/azpromo_2.4.vuze
===================================================================
--- sfweb/plugins/azpromo_2.4.vuze 2017-09-20 13:49:55 UTC (rev 44250)
+++ sfweb/plugins/azpromo_2.4.vuze 2017-09-20 14:21:23 UTC (rev 44251)
Property changes on: sfweb/plugins/azpromo_2.4.vuze
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: sfweb/plugins/azpromo_2.4.zip
===================================================================
(Binary files differ)
Index: sfweb/plugins/azpromo_2.4.zip
===================================================================
--- sfweb/plugins/azpromo_2.4.zip 2017-09-20 13:49:55 UTC (rev 44250)
+++ sfweb/plugins/azpromo_2.4.zip 2017-09-20 14:21:23 UTC (rev 44251)
Property changes on: sfweb/plugins/azpromo_2.4.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: sfweb/plugins/details/azpromo.php
===================================================================
--- sfweb/plugins/details/azpromo.php 2017-09-20 13:49:55 UTC (rev 44250)
+++ sfweb/plugins/details/azpromo.php 2017-09-20 14:21:23 UTC (rev 44251)
@@ -10,6 +10,9 @@
$versions = array(
+ new PluginVersionInfo( "5.7.2.0", "2.4", "plugins/azpromo_2.4.zip", "plugins/azpromo_2.4.zip",
+ "2.4: Improved logging." ),
+
new PluginVersionInfo( "5.7.2.0", "2.3", "plugins/azpromo_2.3.zip", "plugins/azpromo_2.3.zip",
"2.3: Improved reliability and stability." ),
@@ -40,7 +43,7 @@
if ( $compare >= 0 ){
$cvs_version =
- new PluginVersionInfo( "5.7.1.1", "2.3_CVS", "plugins/azpromo_2.3.zip", "plugins/azpromo_2.3.zip",
+ new PluginVersionInfo( "5.7.1.1", "2.4_CVS", "plugins/azpromo_2.4.zip", "plugins/azpromo_2.4.zip",
"" );
}
|
|
From: <liviu@vu...> - 2017-09-20 13:50:06
|
Revision: 44250
Author: liviu
Date: 2017-09-20 13:49:55 +0000 (Wed, 20 Sep 2017)
Log Message:
-----------
Changed logging order
Modified Paths:
--------------
plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java
Modified: plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java
===================================================================
--- plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java 2017-09-20 13:39:35 UTC (rev 44249)
+++ plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java 2017-09-20 13:49:55 UTC (rev 44250)
@@ -427,12 +427,12 @@
MultipleDocumentInterface mdi = UIFunctionsManager.getUIFunctions().getMDI();
mdi.showEntryByID(MultipleDocumentInterface.SIDEBAR_SECTION_PLUS);
} else {
+ PromoPlugin.logEvent("clickNotNow");
+
boolean canCloseOnX = MapUtils.getMapBoolean(mapJSON, "can-close-on-x", false);
if (canCloseOnX) {
- PromoPlugin.logEvent("clickNotNow");
-
- swtInstance.removeViews( UISWTInstance.VIEW_SIDEBAR_AREA, PromoPlugin.VIEWID );
- plugin.removeViewInViews(this);
+ swtInstance.removeViews( UISWTInstance.VIEW_SIDEBAR_AREA, PromoPlugin.VIEWID );
+ plugin.removeViewInViews(this);
}
}
}
|
|
From: <liviu@vu...> - 2017-09-20 13:39:42
|
Revision: 44249
Author: liviu
Date: 2017-09-20 13:39:35 +0000 (Wed, 20 Sep 2017)
Log Message:
-----------
Improved logging.
Modified Paths:
--------------
plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java
plugins/azpromo/plugin.properties
Modified: plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java
===================================================================
--- plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java 2017-09-20 09:28:22 UTC (rev 44248)
+++ plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java 2017-09-20 13:39:35 UTC (rev 44249)
@@ -64,7 +64,7 @@
public class PromoView
implements UISWTViewEventListener
{
- private static final String URL_JSON = "http://client.vuze.com/donation/sidebar_promo.php";;
+ private static final String URL_JSON = "http://client.vuze.com/donation/sidebar_promo.php?ver=2.4";;
private static final String DEFAULT_INHOUSE_HTML = "<html><body style=\"overflow:hidden; margin:100px 10px;\"><p>Please <a target=\"_BLANK\" href=\"http://www.vuze.com/donation/donate.php?sourceRef=sidebarpromo\">Donate</a></BODY></html>";;
@@ -406,6 +406,8 @@
return;
}
+ PromoPlugin.logEvent("clickx");
+
UISWTInstance swtInstance = plugin.getSWTInstance();
if (swtInstance == null) {
return;
@@ -418,6 +420,8 @@
}, 1);
if (result == 1) {
+ PromoPlugin.logEvent("clickUpgrade");
+
SBC_PlusFTUX.setSourceRef("dlg-promo");
MultipleDocumentInterface mdi = UIFunctionsManager.getUIFunctions().getMDI();
@@ -425,7 +429,8 @@
} else {
boolean canCloseOnX = MapUtils.getMapBoolean(mapJSON, "can-close-on-x", false);
if (canCloseOnX) {
- PromoPlugin.logEvent("clickx");
+ PromoPlugin.logEvent("clickNotNow");
+
swtInstance.removeViews( UISWTInstance.VIEW_SIDEBAR_AREA, PromoPlugin.VIEWID );
plugin.removeViewInViews(this);
}
Modified: plugins/azpromo/plugin.properties
===================================================================
--- plugins/azpromo/plugin.properties 2017-09-20 09:28:22 UTC (rev 44248)
+++ plugins/azpromo/plugin.properties 2017-09-20 13:39:35 UTC (rev 44249)
@@ -2,4 +2,4 @@
plugin.langfile=com.vuze.azureus.plugin.azpromo.internat.Messages
plugin.name=Promo View
plugin.id=azpromo
-plugin.version=2.2
+plugin.version=2.4
|
|
From: <liviu@vu...> - 2017-09-20 09:28:31
|
Revision: 44248
Author: liviu
Date: 2017-09-20 09:28:22 +0000 (Wed, 20 Sep 2017)
Log Message:
-----------
Improved reliability and stability.
Modified Paths:
--------------
sfweb/plugins/details/azpromo.php
Modified: sfweb/plugins/details/azpromo.php
===================================================================
--- sfweb/plugins/details/azpromo.php 2017-09-19 12:52:00 UTC (rev 44247)
+++ sfweb/plugins/details/azpromo.php 2017-09-20 09:28:22 UTC (rev 44248)
@@ -40,7 +40,7 @@
if ( $compare >= 0 ){
$cvs_version =
- new PluginVersionInfo( "5.7.1.1", "2.2_CVS", "plugins/azpromo_2.2.zip", "plugins/azpromo_2.2.zip",
+ new PluginVersionInfo( "5.7.1.1", "2.3_CVS", "plugins/azpromo_2.3.zip", "plugins/azpromo_2.3.zip",
"" );
}
|
|
From: <liviu@vu...> - 2017-09-19 12:52:07
|
Revision: 44247
Author: liviu
Date: 2017-09-19 12:52:00 +0000 (Tue, 19 Sep 2017)
Log Message:
-----------
Improved reliability and stability.
Modified Paths:
--------------
sfweb/plugins/details/azpromo.php
Added Paths:
-----------
sfweb/plugins/azpromo_2.3.vuze
sfweb/plugins/azpromo_2.3.zip
Added: sfweb/plugins/azpromo_2.3.vuze
===================================================================
(Binary files differ)
Index: sfweb/plugins/azpromo_2.3.vuze
===================================================================
--- sfweb/plugins/azpromo_2.3.vuze 2017-09-19 12:47:21 UTC (rev 44246)
+++ sfweb/plugins/azpromo_2.3.vuze 2017-09-19 12:52:00 UTC (rev 44247)
Property changes on: sfweb/plugins/azpromo_2.3.vuze
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: sfweb/plugins/azpromo_2.3.zip
===================================================================
(Binary files differ)
Index: sfweb/plugins/azpromo_2.3.zip
===================================================================
--- sfweb/plugins/azpromo_2.3.zip 2017-09-19 12:47:21 UTC (rev 44246)
+++ sfweb/plugins/azpromo_2.3.zip 2017-09-19 12:52:00 UTC (rev 44247)
Property changes on: sfweb/plugins/azpromo_2.3.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: sfweb/plugins/details/azpromo.php
===================================================================
--- sfweb/plugins/details/azpromo.php 2017-09-19 12:47:21 UTC (rev 44246)
+++ sfweb/plugins/details/azpromo.php 2017-09-19 12:52:00 UTC (rev 44247)
@@ -9,8 +9,11 @@
"";
$versions = array(
-
- new PluginVersionInfo( "5.7.2.0", "2.2", "plugins/azpromo_2.2.zip", "plugins/azpromo_2.2.zip",
+
+ new PluginVersionInfo( "5.7.2.0", "2.3", "plugins/azpromo_2.3.zip", "plugins/azpromo_2.3.zip",
+ "2.3: Improved reliability and stability." ),
+
+ new PluginVersionInfo( "5.7.2.0", "2.2", "plugins/azpromo_2.2.zip", "plugins/azpromo_2.2.zip",
"2.2: Fix double view registration on first run.<br>".
"2.1: Pick up alternative license types." ),
|
|
From: <liviu@vu...> - 2017-09-19 12:47:29
|
Revision: 44246
Author: liviu
Date: 2017-09-19 12:47:21 +0000 (Tue, 19 Sep 2017)
Log Message:
-----------
Improved reliability and stability.
Modified Paths:
--------------
plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoPlugin.java
plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java
Modified: plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoPlugin.java
===================================================================
--- plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoPlugin.java 2017-09-01 16:00:45 UTC (rev 44245)
+++ plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoPlugin.java 2017-09-19 12:47:21 UTC (rev 44246)
@@ -59,17 +59,16 @@
/**
* @created Sep 29, 2014
*/
-public class PromoPlugin
- implements UnloadablePlugin
+public class PromoPlugin implements UnloadablePlugin
{
- private static final String VIEWID = "SidebarPromo";
+ protected static final String VIEWID = "SidebarPromo";
private static PromoPlugin pluginInstance;
private Object viewLock = new Object();
private UISWTInstance swtInstance;
- private boolean viewAdded;
+ private boolean didAddViewInSidebar;
private List<PromoView> views = new ArrayList<PromoView>();
@@ -169,45 +168,7 @@
configModel = uiManager.createBasicPluginConfigModel("ConfigView.Section."
+ VIEWID);
- BooleanParameter paramEnabled = configModel.addBooleanParameter2("enabled",
- VIEWID + ".enabled", true);
- paramEnabled.addConfigParameterListener(new ConfigParameterListener() {
- public void configParameterChanged(ConfigParameter param) {
- UIInstance[] uiInstances = pluginInterface.getUIManager().getUIInstances();
- for (UIInstance uiInstance : uiInstances) {
- if (uiInstance instanceof UISWTInstance) {
- swtInstance = (UISWTInstance) uiInstance;
- break;
- }
- }
- if (swtInstance != null) {
- boolean enabled = pluginInterface.getPluginconfig().getPluginBooleanParameter(
- "enabled");
-
- synchronized( viewLock ){
-
- if ( enabled ){
-
- if ( !viewAdded ){
-
- swtInstance.addView(UISWTInstance.VIEW_SIDEBAR_AREA, VIEWID, PromoView.class, null);
-
- viewAdded = true;
- }
- }else{
- if ( viewAdded ){
-
- swtInstance.removeViews( UISWTInstance.VIEW_SIDEBAR_AREA, VIEWID );
-
- viewAdded = false;
-
- PromoPlugin.logEvent("goaway");
- }
- }
- }
- }
- }
- });
+// createEnableDisablePluginEntryInPreferencesMenu(uiManager);
// Get notified when the UI is attached
pluginInterface.getUIManager().addUIListener(new UIManagerListener() {
@@ -223,11 +184,11 @@
synchronized( viewLock ){
- if ( !viewAdded ){
+ if ( !didAddViewInSidebar){
swtInstance.addView(UISWTInstance.VIEW_SIDEBAR_AREA, VIEWID, PromoView.class, null);
- viewAdded = true;
+ didAddViewInSidebar = true;
}
}
}
@@ -275,6 +236,49 @@
});
}
+ private void createEnableDisablePluginEntryInPreferencesMenu(UIManager uiManager) {
+
+ BooleanParameter paramEnabled = configModel.addBooleanParameter2("enabled",
+ VIEWID + ".enabled", true);
+ paramEnabled.addConfigParameterListener(new ConfigParameterListener() {
+ public void configParameterChanged(ConfigParameter param) {
+ UIInstance[] uiInstances = pluginInterface.getUIManager().getUIInstances();
+ for (UIInstance uiInstance : uiInstances) {
+ if (uiInstance instanceof UISWTInstance) {
+ swtInstance = (UISWTInstance) uiInstance;
+ break;
+ }
+ }
+ if (swtInstance != null) {
+ boolean enabled = pluginInterface.getPluginconfig().getPluginBooleanParameter(
+ "enabled");
+
+ synchronized( viewLock ){
+
+ if ( enabled ){
+
+ if ( !didAddViewInSidebar){
+
+ swtInstance.addView(UISWTInstance.VIEW_SIDEBAR_AREA, VIEWID, PromoView.class, null);
+
+ didAddViewInSidebar = true;
+ }
+ }else{
+ if (didAddViewInSidebar){
+
+ swtInstance.removeViews( UISWTInstance.VIEW_SIDEBAR_AREA, VIEWID );
+
+ didAddViewInSidebar = false;
+
+ PromoPlugin.logEvent("goaway");
+ }
+ }
+ }
+ }
+ }
+ });
+ }
+
protected void checkLicence() {
boolean hasLicence = FeatureUtils.hasPlusLicence() || FeatureUtils.hasNoAdLicence();
@@ -297,11 +301,11 @@
synchronized( viewLock ){
- if ( viewAdded ){
+ if (didAddViewInSidebar){
swtInstance.removeViews(UISWTInstance.VIEW_SIDEBAR_AREA, VIEWID);
- viewAdded = false;
+ didAddViewInSidebar = false;
}
}
@@ -508,17 +512,17 @@
}
protected void
- viewAdded(
+ addViewInViews(
PromoView view )
{
synchronized( views ){
-
+
views.add( view );
}
}
protected void
- viewRemoved(
+ removeViewInViews(
PromoView view )
{
synchronized( views ){
@@ -538,4 +542,8 @@
return( pluginInstance );
}
+ protected List<PromoView> getViews(){
+ return new ArrayList<>(views);
+ }
+
}
Modified: plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java
===================================================================
--- plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java 2017-09-01 16:00:45 UTC (rev 44245)
+++ plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java 2017-09-19 12:47:21 UTC (rev 44246)
@@ -23,6 +23,7 @@
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.List;
import java.util.Map;
import java.util.logging.Handler;
import java.util.logging.LogRecord;
@@ -87,7 +88,7 @@
public boolean eventOccurred(UISWTViewEvent event) {
switch (event.getType()) {
case UISWTViewEvent.TYPE_CREATE:
- plugin.viewAdded( this );
+ plugin.addViewInViews( this );
break;
case UISWTViewEvent.TYPE_INITIALIZE:
@@ -99,7 +100,7 @@
break;
case UISWTViewEvent.TYPE_DESTROY:
- plugin.viewRemoved( this );
+ plugin.removeViewInViews( this );
break;
case UISWTViewEvent.TYPE_DATASOURCE_CHANGED:
@@ -254,8 +255,8 @@
}
});
}
-
-
+
+
adBrowser = new Browser(ourParent, SWT.NO_SCROLL);
adBrowser.addOpenWindowListener(new OpenWindowListener() {
public void open(WindowEvent event) {
@@ -328,14 +329,14 @@
flipTest(0);
}
-
+
showEvery = mapJSON == null ? 1000 * 60 * 15
: MapUtils.getMapInt(mapJSON, "show-every-ms", 1000 * 60 * 5);
-
+
if (timeEvent_inHouse != null) {
timeEvent_inHouse.cancel();
}
-
+
timeEvent_inHouse = SimpleTimer.addEvent("pv", SystemTime.getOffsetTime(showEvery),
new TimerEventPerformer() {
@@ -378,21 +379,33 @@
return;
}
- if (adBrowser == null || adBrowser.isDisposed()) {
+ boolean popupOnShowEvery = MapUtils.getMapBoolean(mapJSON, "popup-on-show-every", false);
+ if (popupOnShowEvery) {
+ addViewIfNotPresent();
+ } else if (adBrowser == null || adBrowser.isDisposed()) {
return;
}
-
- setInHouse(true);
+ if (adBrowser != null && ! adBrowser.isDisposed()) {
+ setInHouse(true);
+ }
}
});
}
+ private void addViewIfNotPresent() {
+ List<PromoView> views = plugin.getViews();
+ boolean isPromoViewAlreadyShown = views.contains(this);
+ if (! isPromoViewAlreadyShown) {
+ plugin.getSWTInstance().addView(UISWTInstance.VIEW_SIDEBAR_AREA, PromoPlugin.VIEWID, PromoView.class, null);
+ plugin.addViewInViews(this);
+ }
+ }
+
protected void temporaryClose() {
if (view == null) {
return;
}
- view.closeView();
- PromoPlugin.logEvent("clickx");
+
UISWTInstance swtInstance = plugin.getSWTInstance();
if (swtInstance == null) {
return;
@@ -409,6 +422,13 @@
MultipleDocumentInterface mdi = UIFunctionsManager.getUIFunctions().getMDI();
mdi.showEntryByID(MultipleDocumentInterface.SIDEBAR_SECTION_PLUS);
+ } else {
+ boolean canCloseOnX = MapUtils.getMapBoolean(mapJSON, "can-close-on-x", false);
+ if (canCloseOnX) {
+ PromoPlugin.logEvent("clickx");
+ swtInstance.removeViews( UISWTInstance.VIEW_SIDEBAR_AREA, PromoPlugin.VIEWID );
+ plugin.removeViewInViews(this);
+ }
}
}
@@ -428,7 +448,7 @@
showingInHouse = on;
}
adBrowser.setText("");
- String html = showingInHouse ? MapUtils.getMapString(mapJSON, "html", DEFAULT_INHOUSE_HTML) : DEFAULT_INHOUSE_HTML;
+ String html = showingInHouse ? MapUtils.getMapString(mapJSON, "html", DEFAULT_INHOUSE_HTML) : DEFAULT_INHOUSE_HTML;
adBrowser.setText(html);
}
|
|
From: <liviu@vu...> - 2017-09-01 16:00:54
|
Revision: 44245
Author: liviu
Date: 2017-09-01 16:00:45 +0000 (Fri, 01 Sep 2017)
Log Message:
-----------
set the build name after setting the build version
the build name is used in several post initialization tasks
Modified Paths:
--------------
client/trunk/build.xml
Modified: client/trunk/build.xml
===================================================================
--- client/trunk/build.xml 2017-09-01 15:53:53 UTC (rev 44244)
+++ client/trunk/build.xml 2017-09-01 16:00:45 UTC (rev 44245)
@@ -14,8 +14,7 @@
<property file="${build.properties}" />
<echo message="using.ext.props = ${using.ext.props}" />
- <property name="build.name" value="Vuze_${build.ver}" />
-
+
<property name="azureus2.dir" value="azureus2"/>
<property name="azureus3.dir" value="azureus3"/>
<property name="uis.dir" value="uis"/>
@@ -62,7 +61,11 @@
<target name="setBuildVersion" depends="setMajorVersion">
<property name="build.ver" value="${major.ver}-${minor.ver}"/>
+ <property name="build.name" value="Vuze_${build.ver}" />
+
<echo message="Build version: ${build.ver}" />
+ <echo message="Build name: ${build.name}" />
+
</target>
<path id="build.classpath">
|
|
From: <liviu@vu...> - 2017-09-01 15:54:00
|
Revision: 44244
Author: liviu
Date: 2017-09-01 15:53:53 +0000 (Fri, 01 Sep 2017)
Log Message:
-----------
try to get the minor version from the environment
and try to set the build version composed from the new values
Modified Paths:
--------------
client/trunk/build.xml
Modified: client/trunk/build.xml
===================================================================
--- client/trunk/build.xml 2017-09-01 08:39:15 UTC (rev 44243)
+++ client/trunk/build.xml 2017-09-01 15:53:53 UTC (rev 44244)
@@ -6,6 +6,8 @@
<project basedir="." default="package" name="VuzeClient">
+ <property environment="env" />
+
<!-- Load vars from external properties file -->
<condition property="using.ext.props" > <isset property="build.props.file" /> </condition>
<property name="build.properties" value="${build.props.file}"/>
@@ -24,9 +26,10 @@
<property name="dist.dir" value="dist"/>
<!-- Default variables -->
- <property name="major.ver" value="0000"/>
- <property name="minor.ver" value="00"/>
- <property name="build.ver" value="${major.ver}-${minor.ver}"/>
+ <property name="majormajor.ver" value="0000"/>
+ <condition property="minor.ver" value="${env.BUILD_NUMBER}" else="00">
+ <isset property="env.BUILD_NUMBER" />
+ </condition>
<!-- Read the version line from Constants.java in a property -->
<target name="loadVersionLine">
@@ -48,18 +51,20 @@
var majorVersion = before.match(regexp)[1];
project.setProperty("major.ver", majorVersion);
</script>
- <echo>after=${major.ver}</echo>
</target>
-
-
<!-- REUSABLE REFERENCES -->
<target name="setMajorVersion" depends="extractVersionFromVersionLine">
- <echo message="BUILDING: ${major.ver}" />
+ <echo message="Major version: ${major.ver}" />
</target>
+ <target name="setBuildVersion" depends="setMajorVersion">
+ <property name="build.ver" value="${major.ver}-${minor.ver}"/>
+ <echo message="Build version: ${build.ver}" />
+ </target>
+
<path id="build.classpath">
<fileset dir="${azureus2.dir}/lib" includes="*.jar" excludes="swt-carbon.jar"/>
<fileset dir="${azureus3.dir}/lib" includes="*.jar" />
@@ -92,7 +97,7 @@
</target>
- <target name="init" depends="setMajorVersion">
+ <target name="init">
<echo message="BUILDING: ${ant.project.name} [${ant.file}] [${build.props.file}]"/>
<mkdir dir="${build.dir}"/>
@@ -100,7 +105,7 @@
</target>
- <target name="preprocess" if="using.ext.props" >
+ <target name="preprocess" depends="setBuildVersion" if="using.ext.props" >
<!-- Tag source with version info -->
<property name="constants.file" value="${azureus2.dir}/src/org/gudy/azureus2/core3/util/Constants.java"/>
<replace file="${constants.file}" token="_CVS"" value="_B${minor.ver}"" summary="true" />
|
|
From: <liviu@vu...> - 2017-09-01 08:44:39
|
Revision: 44242
Author: liviu
Date: 2017-09-01 08:25:34 +0000 (Fri, 01 Sep 2017)
Log Message:
-----------
changing the build process to allow easier and faster building using CI
Modified Paths:
--------------
client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java
client/trunk/build.xml
Modified: client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java
===================================================================
--- client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java 2017-04-25 20:28:32 UTC (rev 44241)
+++ client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java 2017-09-01 08:25:34 UTC (rev 44242)
@@ -140,10 +140,10 @@
public static final String AZUREUS_NAME = "Azureus";
public static final String AZUREUS_PROTOCOL_NAME_PRE_4813 = "Azureus";
public static final String AZUREUS_PROTOCOL_NAME = "Vuze";
- public static final String AZUREUS_VERSION = "5.7.5.1_CVS";
+ public static final String AZUREUS_VERSION = "5.7.5.1";
public static final String BUILD_VERSION = "@build.version@"; //Ant replace
public static final String AZUREUS_SUBVER = "";
- public static final byte[] VERSION_ID = ("-" + "AZ" + "5751" + "-").getBytes(); //MUST be 8 chars long!
+ public static final byte[] VERSION_ID = ("-" + "AZ" + AZUREUS_VERSION.replace('.', '') + "-").getBytes(); //MUST be 8 chars long!
private static final boolean FORCE_NON_CVS = System.getProperty( "az.force.noncvs", "0" ).equals( "1" );
Modified: client/trunk/build.xml
===================================================================
--- client/trunk/build.xml 2017-04-25 20:28:32 UTC (rev 44241)
+++ client/trunk/build.xml 2017-09-01 08:25:34 UTC (rev 44242)
@@ -11,12 +11,7 @@
<property name="build.properties" value="${build.props.file}"/>
<property file="${build.properties}" />
<echo message="using.ext.props = ${using.ext.props}" />
-
-
- <!-- Default variables -->
- <property name="major.ver" value="0000"/>
- <property name="minor.ver" value="00"/>
- <property name="build.ver" value="${major.ver}-${minor.ver}"/>
+
<property name="build.name" value="Vuze_${build.ver}" />
<property name="azureus2.dir" value="azureus2"/>
@@ -27,10 +22,44 @@
<property name="build.dir" value="build"/>
<property name="dist.dir" value="dist"/>
-
-
+
+ <!-- Default variables -->
+ <property name="major.ver" value="0000"/>
+ <property name="minor.ver" value="00"/>
+ <property name="build.ver" value="${major.ver}-${minor.ver}"/>
+
+ <!-- Read the version line from Constants.java in a property -->
+ <target name="loadVersionLine">
+ <loadfile property="versionLine" srcfile="${azureus2.dir}/src/org/gudy/azureus2/core3/util/Constants.java">
+ <filterchain>
+ <linecontainsregexp>
+ <regexp pattern=' public static final String AZUREUS_VERSION = "(.*)";'/>
+ </linecontainsregexp>
+ </filterchain>
+ </loadfile>
+ </target>
+
+ <target name="extractVersionFromVersionLine" depends="loadVersionLine">
+
+ <property name="versionLineBeforeExtract" value="${versionLine}"/>
+ <script language="javascript">
+ var regexp = '"(.*)"';
+ var before = project.getProperty("versionLineBeforeExtract");
+ var majorVersion = before.match(regexp)[1];
+ project.setProperty("major.ver", majorVersion);
+ </script>
+ <echo>after=${major.ver}</echo>
+ </target>
+
+
+
<!-- REUSABLE REFERENCES -->
-
+
+
+ <target name="setMajorVersion" depends="extractVersionFromVersionLine">
+ <echo message="BUILDING: ${major.ver}" />
+ </target>
+
<path id="build.classpath">
<fileset dir="${azureus2.dir}/lib" includes="*.jar" excludes="swt-carbon.jar"/>
<fileset dir="${azureus3.dir}/lib" includes="*.jar" />
@@ -63,7 +92,8 @@
</target>
- <target name="init">
+ <target name="init" depends="setMajorVersion">
+
<echo message="BUILDING: ${ant.project.name} [${ant.file}] [${build.props.file}]"/>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
|
|
From: <liviu@vu...> - 2017-09-01 08:39:25
|
Revision: 44243
Author: liviu
Date: 2017-09-01 08:39:15 +0000 (Fri, 01 Sep 2017)
Log Message:
-----------
replace using the Strings not chars
Modified Paths:
--------------
client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java
Modified: client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java
===================================================================
--- client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java 2017-09-01 08:25:34 UTC (rev 44242)
+++ client/trunk/azureus2/src/org/gudy/azureus2/core3/util/Constants.java 2017-09-01 08:39:15 UTC (rev 44243)
@@ -143,7 +143,7 @@
public static final String AZUREUS_VERSION = "5.7.5.1";
public static final String BUILD_VERSION = "@build.version@"; //Ant replace
public static final String AZUREUS_SUBVER = "";
- public static final byte[] VERSION_ID = ("-" + "AZ" + AZUREUS_VERSION.replace('.', '') + "-").getBytes(); //MUST be 8 chars long!
+ public static final byte[] VERSION_ID = ("-" + "AZ" + AZUREUS_VERSION.replace(".","") + "-").getBytes(); //MUST be 8 chars long!
private static final boolean FORCE_NON_CVS = System.getProperty( "az.force.noncvs", "0" ).equals( "1" );
|
|
From: <pgardner@vu...> - 2017-04-25 20:28:47
|
Revision: 44241
Author: pgardner
Date: 2017-04-25 20:28:32 +0000 (Tue, 25 Apr 2017)
Log Message:
-----------
aznettorbrowser: 6.5.2
Modified Paths:
--------------
sfweb/plugins/details/aznettorbrowser.php
Added Paths:
-----------
sfweb/plugins/aznettorbrowser-linux32_6.5.2.zip
sfweb/plugins/aznettorbrowser-linux64_6.5.2.zip
sfweb/plugins/aznettorbrowser-osx64_6.5.2.zip
sfweb/plugins/aznettorbrowser-win32_6.5.2.zip
Added: sfweb/plugins/aznettorbrowser-linux32_6.5.2.zip
===================================================================
(Binary files differ)
Index: sfweb/plugins/aznettorbrowser-linux32_6.5.2.zip
===================================================================
--- sfweb/plugins/aznettorbrowser-linux32_6.5.2.zip 2017-04-20 22:02:29 UTC (rev 44240)
+++ sfweb/plugins/aznettorbrowser-linux32_6.5.2.zip 2017-04-25 20:28:32 UTC (rev 44241)
Property changes on: sfweb/plugins/aznettorbrowser-linux32_6.5.2.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: sfweb/plugins/aznettorbrowser-linux64_6.5.2.zip
===================================================================
(Binary files differ)
Index: sfweb/plugins/aznettorbrowser-linux64_6.5.2.zip
===================================================================
--- sfweb/plugins/aznettorbrowser-linux64_6.5.2.zip 2017-04-20 22:02:29 UTC (rev 44240)
+++ sfweb/plugins/aznettorbrowser-linux64_6.5.2.zip 2017-04-25 20:28:32 UTC (rev 44241)
Property changes on: sfweb/plugins/aznettorbrowser-linux64_6.5.2.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: sfweb/plugins/aznettorbrowser-osx64_6.5.2.zip
===================================================================
(Binary files differ)
Index: sfweb/plugins/aznettorbrowser-osx64_6.5.2.zip
===================================================================
--- sfweb/plugins/aznettorbrowser-osx64_6.5.2.zip 2017-04-20 22:02:29 UTC (rev 44240)
+++ sfweb/plugins/aznettorbrowser-osx64_6.5.2.zip 2017-04-25 20:28:32 UTC (rev 44241)
Property changes on: sfweb/plugins/aznettorbrowser-osx64_6.5.2.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: sfweb/plugins/aznettorbrowser-win32_6.5.2.zip
===================================================================
(Binary files differ)
Index: sfweb/plugins/aznettorbrowser-win32_6.5.2.zip
===================================================================
--- sfweb/plugins/aznettorbrowser-win32_6.5.2.zip 2017-04-20 22:02:29 UTC (rev 44240)
+++ sfweb/plugins/aznettorbrowser-win32_6.5.2.zip 2017-04-25 20:28:32 UTC (rev 44241)
Property changes on: sfweb/plugins/aznettorbrowser-win32_6.5.2.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: sfweb/plugins/details/aznettorbrowser.php
===================================================================
--- sfweb/plugins/details/aznettorbrowser.php 2017-04-20 22:02:29 UTC (rev 44240)
+++ sfweb/plugins/details/aznettorbrowser.php 2017-04-25 20:28:32 UTC (rev 44241)
@@ -25,7 +25,8 @@
$versions = array(
- new PluginVersionInfo( "5.6.1.0", "6.5.1", "plugins/aznettorbrowser-win32_6.5.1.zip", "plugins/aznettorbrowser-win32_6.5.1.zip",
+ new PluginVersionInfo( "5.6.1.0", "6.5.2", "plugins/aznettorbrowser-win32_6.5.2.zip", "plugins/aznettorbrowser-win32_6.5.2.zip",
+ "6.5.2: Update browser to 6.5.2.<br>".
"6.5.1: Update browser to 6.5.1.<br>".
"6.5: Update browser to 6.5.<br>".
"6.0.8: Update browser to 6.0.8.<br>".
@@ -82,7 +83,7 @@
);
$cvs_version =
- new PluginVersionInfo( "5.7.3.1", "6.5.1_CVS", "plugins/aznettorbrowser-win32_6.5.1.zip", "plugins/aznettorbrowser-win32_6.5.1.zip",
+ new PluginVersionInfo( "5.7.5.1", "6.5.2_CVS", "plugins/aznettorbrowser-win32_6.5.2.zip", "plugins/aznettorbrowser-win32_6.5.2.zip",
"" );
}else if ( strpos(strtolower(" " . $os), 'mac os') > 0 ){
@@ -95,7 +96,8 @@
$versions = array(
- new PluginVersionInfo( "5.6.1.0", "6.5.1", "plugins/aznettorbrowser-osx64_6.5.1.zip", "plugins/aznettorbrowser-osx64_6.5.1.zip",
+ new PluginVersionInfo( "5.6.1.0", "6.5.2", "plugins/aznettorbrowser-osx64_6.5.2.zip", "plugins/aznettorbrowser-osx64_6.5.2.zip",
+ "6.5.2: Update browser to 6.5.2.<br>".
"6.5.1: Update browser to 6.5.1.<br>".
"6.5: Update browser to 6.5.<br>".
"6.0.8: Update browser to 6.0.8.<br>".
@@ -127,7 +129,7 @@
);
$cvs_version =
- new PluginVersionInfo( "5.7.5.1", "6.5.1_CVS", "plugins/aznettorbrowser-osx64_6.5.1.zip", "plugins/aznettorbrowser-osx64_6.5.1.zip",
+ new PluginVersionInfo( "5.7.5.1", "6.5.2_CVS", "plugins/aznettorbrowser-osx64_6.5.2.zip", "plugins/aznettorbrowser-osx64_6.5.2.zip",
"" );
}else{
@@ -175,7 +177,8 @@
$versions = array(
- new PluginVersionInfo( "5.6.1.0", "6.5.1", "plugins/aznettorbrowser-linux64_6.5.1.zip", "plugins/aznettorbrowser-linux64_6.5.1.zip",
+ new PluginVersionInfo( "5.6.1.0", "6.5.2", "plugins/aznettorbrowser-linux64_6.5.2.zip", "plugins/aznettorbrowser-linux64_6.5.2.zip",
+ "6.5.2: Update browser to 6.5.2.<br>".
"6.5.1: Update browser to 6.5.1.<br>".
"6.5: Update browser to 6.5.<br>".
"6.0.8: Update browser to 6.0.8.<br>".
@@ -207,7 +210,7 @@
);
$cvs_version =
- new PluginVersionInfo( "5.7.5.1", "6.5.1_CVS", "plugins/aznettorbrowser-linux64_6.5.1.zip", "plugins/aznettorbrowser-linux64_6.5.1.zip",
+ new PluginVersionInfo( "5.7.5.1", "6.5.2_CVS", "plugins/aznettorbrowser-linux64_6.5.2.zip", "plugins/aznettorbrowser-linux64_6.5.2.zip",
"" );
}else{
@@ -214,7 +217,8 @@
$versions = array(
- new PluginVersionInfo( "5.6.1.0", "6.5.1", "plugins/aznettorbrowser-linux32_6.5.1.zip", "plugins/aznettorbrowser-linux32_6.5.1.zip",
+ new PluginVersionInfo( "5.6.1.0", "6.5.2", "plugins/aznettorbrowser-linux32_6.5.2.zip", "plugins/aznettorbrowser-linux32_6.5.2.zip",
+ "6.5.2: Update browser to 6.5.2.<br>".
"6.5.1: Update browser to 6.5.1.<br>".
"6.5: Update browser to 6.5.<br>".
"6.0.8: Update browser to 6.0.8.<br>".
@@ -246,7 +250,7 @@
);
$cvs_version =
- new PluginVersionInfo( "5.7.5.1", "6.5.1_CVS", "plugins/aznettorbrowser-linux32_6.5.1.zip", "plugins/aznettorbrowser-linux32_6.5.1.zip",
+ new PluginVersionInfo( "5.7.5.1", "6.5.2_CVS", "plugins/aznettorbrowser-linux32_6.5.2.zip", "plugins/aznettorbrowser-linux32_6.5.2.zip",
"" );
}
}
|
|
From: <pgardner@vu...> - 2017-04-20 22:02:36
|
Revision: 44240
Author: pgardner
Date: 2017-04-20 22:02:29 +0000 (Thu, 20 Apr 2017)
Log Message:
-----------
Update headers for linux
Modified Paths:
--------------
sfweb/plugins/details/azutp.php
Added Paths:
-----------
sfweb/plugins/azutp_0.5.7.vuze
sfweb/plugins/azutp_0.5.7.zip
Added: sfweb/plugins/azutp_0.5.7.vuze
===================================================================
(Binary files differ)
Index: sfweb/plugins/azutp_0.5.7.vuze
===================================================================
--- sfweb/plugins/azutp_0.5.7.vuze 2017-04-20 20:22:31 UTC (rev 44239)
+++ sfweb/plugins/azutp_0.5.7.vuze 2017-04-20 22:02:29 UTC (rev 44240)
Property changes on: sfweb/plugins/azutp_0.5.7.vuze
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: sfweb/plugins/azutp_0.5.7.zip
===================================================================
(Binary files differ)
Index: sfweb/plugins/azutp_0.5.7.zip
===================================================================
--- sfweb/plugins/azutp_0.5.7.zip 2017-04-20 20:22:31 UTC (rev 44239)
+++ sfweb/plugins/azutp_0.5.7.zip 2017-04-20 22:02:29 UTC (rev 44240)
Property changes on: sfweb/plugins/azutp_0.5.7.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: sfweb/plugins/details/azutp.php
===================================================================
--- sfweb/plugins/details/azutp.php 2017-04-20 20:22:31 UTC (rev 44239)
+++ sfweb/plugins/details/azutp.php 2017-04-20 22:02:29 UTC (rev 44240)
@@ -174,7 +174,7 @@
);
$cvs_version =
- new PluginVersionInfo( "5.7.1.1", "0.5.6_CVS", "plugins/azutp_0.5.6.zip", "plugins/azutp_0.5.6.zip",
+ new PluginVersionInfo( "5.7.5.1", "0.5.7_CVS", "plugins/azutp_0.5.7.zip", "plugins/azutp_0.5.7.zip",
"" );
}
|
|
From: <vuzedev@vu...> - 2017-04-20 20:22:40
|
Revision: 44239
Author: vuzedev
Date: 2017-04-20 20:22:31 +0000 (Thu, 20 Apr 2017)
Log Message:
-----------
Property Changed:
----------------
plugins/mlDHT/
Index: plugins/mlDHT
===================================================================
--- plugins/mlDHT 2017-04-20 19:20:45 UTC (rev 44238)
+++ plugins/mlDHT 2017-04-20 20:22:31 UTC (rev 44239)
Property changes on: plugins/mlDHT
___________________________________________________________________
Modified: svn:ignore
## -3,3 +3,5 ##
.project
*.jar
*.vuze
+
+bin
|
|
From: <amogge@vu...> - 2017-04-20 19:20:55
|
Revision: 44238
Author: amogge
Date: 2017-04-20 19:20:45 +0000 (Thu, 20 Apr 2017)
Log Message:
-----------
Tidy up
Modified Paths:
--------------
plugins/3DView/com/aelitis/azureus/plugins/view3d/ViewTest2.java
plugins/aercm/com/aelitis/plugins/rcmplugin/RCMPatcher.java
plugins/aercm/com/aelitis/plugins/rcmplugin/RCMPlugin.java
plugins/aercm/com/aelitis/plugins/rcmplugin/RCM_SearchProvider.java
plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentEnumerator.java
plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentUI.java
plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentUISWT.java
plugins/aercm/com/aelitis/plugins/rcmplugin/SBC_RCMView.java
plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Actions.java
plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Hash.java
plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_LastSeen.java
plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Level.java
plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_New.java
plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Rank.java
plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_RelatedTo.java
plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Size.java
plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Title.java
plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Tracker.java
plugins/azbosskey/src/com/vuze/plugins/azbosskey/BossKeyPlugin.java
plugins/azdowndel/com/azureus/plugins/azdowndel/DownloadDeleterPlugin.java
plugins/azhighchartsstats/com/azureus/plugins/highchartsstats/HighchartsStatsPlugin.java
plugins/azlocprov/com/vuze/plugins/azlocprov/LocationProviderImpl.java
plugins/azlocprov/com/vuze/plugins/azlocprov/LocationProviderPlugin.java
plugins/azpeerthrottler/com/aelitis/azureus/plugins/peerthrottler/PeerThrottlerPlugin.java
plugins/azrssgen/com/azureus/plugins/azrssgen/RSSFeedGeneratorPlugin.java
plugins/aztoolbartest/com/vuze/plugins/test/DefaultActivationImpl.java
plugins/aztoolbartest/com/vuze/plugins/test/PluginToolBarTest.java
plugins/aztorrentmaker/org/parg/azureus/plugins/aztorrentmaker/TorrentMakerPlugin.java
plugins/aztrackerurladder/com/azureus/plugins/trackerurladder/TrackerURLAdderPlugin.java
plugins/azupnpav/com/aelitis/azureus/plugins/upnpmediaserver/UPnPMediaServerContentDirectory.java
plugins/azupnpav/com/aelitis/azureus/plugins/upnpmediaserver/UPnPMediaServerHTTP.java
plugins/azupnpav/com/aelitis/azureus/plugins/upnpmediaserver/UPnPMediaServerTranscoder.java
plugins/btapp/com/vuze/plugin/btapp/BtAppListView.java
plugins/jpc/com/aelitis/azureus/plugins/jpc/cache/impl/JPCCacheMultiplexerHelper.java
plugins/jpc/com/aelitis/azureus/plugins/jpc/peer/impl/PeerControllerImpl.java
plugins/mlDHT/lbms/plugins/mldht/azureus/AlternativeContactHandler.java
plugins/mlDHT/lbms/plugins/mldht/azureus/UIHelper.java
plugins/mlDHT/lbms/plugins/mldht/kad/AnnounceResponseHandler.java
plugins/mlDHT/lbms/plugins/mldht/kad/RPCServerListener.java
plugins/mlab/com/vuze/plugins/mlab/MLabPlugin.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/ActionEvent.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/ActionListener.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/AppletContext.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BadLocationException.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BorderFactory.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BorderLayout.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BoxLayout.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Clipboard.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Color.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Component.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Cursor.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Dimension.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JApplet.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JButton.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JCheckBox.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JComboBox.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JFrame.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JLabel.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JOptionPane.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JPanel.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JProgressBar.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JScrollPane.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JSpinner.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JTextArea.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JTextPane.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/MouseAdapter.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/MouseEvent.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Panel.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/SpinnerNumberModel.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/StringSelection.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/StyledDocument.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Tcpbw100UIWrapper.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Tcpbw100UIWrapperListener.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Toolkit.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/WindowAdapter.java
plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/WindowEvent.java
plugins/mlab/com/vuze/plugins/mlab/ui/MLabWizard.java
plugins/mlab/com/vuze/plugins/mlab/ui/MLabWizardNDT.java
plugins/mlab/com/vuze/plugins/mlab/ui/MLabWizardStart.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperAdapter.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperDHT.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperDHTAdapter.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperDHTListener.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperMessageHandler.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperNetworkMixer.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperPlugin.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperRouter.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperRouterDHT.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperSocksProxy.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperUtils.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/swt/I2PHelperView.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/tracker/I2PHelperTracker.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTAZ.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTI2P.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportAZ.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportContactAZ.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportContactI2P.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportI2P.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTUtilsI2P.java
plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/I2PHelperAZDHT.java
plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPlugin.java
plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPluginHTTPProxy.java
plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPluginUI.java
plugins/networks/tor/org/parg/azureus/plugins/networks/tor/swt/TorPluginUISWT.java
plugins/networks/torbrowser/org/parg/azureus/plugins/networks/torbrowser/TorBrowserPlugin.java
plugins/rating/com/aelitis/azureus/plugins/rating/RatingUI.java
plugins/rating/com/aelitis/azureus/plugins/rating/ui/RatingSWTUI.java
plugins/twitter/com/vuze/client/plugins/twitter/TwitterPlugin.java
plugins/vzcoreinstaller/com/vuze/plugins/coreinstaller/CoreInstallerPlugin.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/SearchInstance.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/TagSearchInstance.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/TextualException.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/TorrentBlank.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/XMWebUIPlugin.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/XMRPCClientTest.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/connect/XMClientAccount.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/connect/XMClientConnection.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/connect/XMClientConnectionAdapter.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/proxy/XMClientProxy.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClient.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientCached.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientDirect.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientException.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientFactory.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientIndirect.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientTunnel.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientTunnelHandler.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientUtils.java
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/swt/XMWebUIPluginView.java
Added Paths:
-----------
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPlugin.java
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginEngine.java
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginEngineReal.java
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginListener.java
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginPageGenerator.java
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginPageGeneratorAdaptor.java
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginSearch.java
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginStats.java
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/internat/
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/internat/Messages.properties
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/test/
plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/test/Main.java
Removed Paths:
-------------
plugins/xmwebui/aeremsearchplugin.jar
Modified: plugins/3DView/com/aelitis/azureus/plugins/view3d/ViewTest2.java
===================================================================
--- plugins/3DView/com/aelitis/azureus/plugins/view3d/ViewTest2.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/3DView/com/aelitis/azureus/plugins/view3d/ViewTest2.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,16 +6,17 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/RCMPatcher.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/RCMPatcher.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/RCMPatcher.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,19 +6,21 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin;
import java.io.File;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/RCMPlugin.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/RCMPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/RCMPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin;
import java.util.*;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/RCM_SearchProvider.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/RCM_SearchProvider.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/RCM_SearchProvider.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -2,19 +2,22 @@
* Created on Sep 28, 2012
*
* Copyright 2011 Vuze, LLC. All rights reserved.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentEnumerator.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentEnumerator.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentEnumerator.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2009 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin;
import com.aelitis.azureus.core.content.RelatedContent;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentUI.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentUI.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentUI.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin;
import org.gudy.azureus2.plugins.download.Download;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentUISWT.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentUISWT.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentUISWT.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,21 +3,23 @@
* Created by Paul Gardner
*
* Copyright 2009 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin;
import java.util.*;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/SBC_RCMView.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/SBC_RCMView.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/SBC_RCMView.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -2,20 +2,23 @@
* Created on Feb 24, 2009
*
* Copyright 2008 Vuze, Inc. All rights reserved.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Actions.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Actions.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Actions.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -2,18 +2,20 @@
* Created on Aug 25, 2009
*
* Copyright 2008 Vuze, Inc. All rights reserved.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package com.aelitis.plugins.rcmplugin.columns;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Hash.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Hash.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Hash.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -2,18 +2,20 @@
* Created on Feb 26, 2009
*
* Copyright 2008 Vuze, Inc. All rights reserved.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package com.aelitis.plugins.rcmplugin.columns;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_LastSeen.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_LastSeen.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_LastSeen.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -2,20 +2,23 @@
* Created on Feb 26, 2009
*
* Copyright 2008 Vuze, Inc. All rights reserved.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin.columns;
import com.aelitis.azureus.core.content.RelatedContent;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Level.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Level.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Level.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -2,20 +2,23 @@
* Created on Feb 26, 2009
*
* Copyright 2008 Vuze, Inc. All rights reserved.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin.columns;
import com.aelitis.azureus.core.content.RelatedContent;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_New.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_New.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_New.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -2,20 +2,23 @@
* Created on Sep 25, 2008
*
* Copyright 2008 Vuze, Inc. All rights reserved.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin.columns;
import org.eclipse.swt.SWT;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Rank.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Rank.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Rank.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -2,20 +2,23 @@
* Created on Feb 26, 2009
*
* Copyright 2008 Vuze, Inc. All rights reserved.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin.columns;
import com.aelitis.azureus.core.content.RelatedContent;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_RelatedTo.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_RelatedTo.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_RelatedTo.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -2,20 +2,23 @@
* Created on Feb 26, 2009
*
* Copyright 2008 Vuze, Inc. All rights reserved.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin.columns;
import org.eclipse.swt.SWT;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Size.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Size.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Size.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -2,20 +2,23 @@
* Created on Feb 26, 2009
*
* Copyright 2008 Vuze, Inc. All rights reserved.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin.columns;
import com.aelitis.azureus.core.content.RelatedContent;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Title.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Title.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Title.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -2,20 +2,23 @@
* Created on Feb 26, 2009
*
* Copyright 2008 Vuze, Inc. All rights reserved.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin.columns;
import com.aelitis.azureus.core.content.RelatedContent;
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Tracker.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Tracker.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/columns/ColumnRC_Tracker.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -2,20 +2,23 @@
* Created on Feb 26, 2009
*
* Copyright 2008 Vuze, Inc. All rights reserved.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.plugins.rcmplugin.columns;
import com.aelitis.azureus.core.content.RelatedContent;
Modified: plugins/azbosskey/src/com/vuze/plugins/azbosskey/BossKeyPlugin.java
===================================================================
--- plugins/azbosskey/src/com/vuze/plugins/azbosskey/BossKeyPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/azbosskey/src/com/vuze/plugins/azbosskey/BossKeyPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2013 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.azbosskey;
import java.awt.event.KeyEvent;
Modified: plugins/azdowndel/com/azureus/plugins/azdowndel/DownloadDeleterPlugin.java
===================================================================
--- plugins/azdowndel/com/azureus/plugins/azdowndel/DownloadDeleterPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/azdowndel/com/azureus/plugins/azdowndel/DownloadDeleterPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2008 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.azureus.plugins.azdowndel;
import java.io.File;
Modified: plugins/azhighchartsstats/com/azureus/plugins/highchartsstats/HighchartsStatsPlugin.java
===================================================================
--- plugins/azhighchartsstats/com/azureus/plugins/highchartsstats/HighchartsStatsPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/azhighchartsstats/com/azureus/plugins/highchartsstats/HighchartsStatsPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2012 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.azureus.plugins.highchartsstats;
import java.io.File;
Modified: plugins/azlocprov/com/vuze/plugins/azlocprov/LocationProviderImpl.java
===================================================================
--- plugins/azlocprov/com/vuze/plugins/azlocprov/LocationProviderImpl.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/azlocprov/com/vuze/plugins/azlocprov/LocationProviderImpl.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2013 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.azlocprov;
import java.io.ByteArrayInputStream;
Modified: plugins/azlocprov/com/vuze/plugins/azlocprov/LocationProviderPlugin.java
===================================================================
--- plugins/azlocprov/com/vuze/plugins/azlocprov/LocationProviderPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/azlocprov/com/vuze/plugins/azlocprov/LocationProviderPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2013 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.azlocprov;
import java.io.File;
Modified: plugins/azpeerthrottler/com/aelitis/azureus/plugins/peerthrottler/PeerThrottlerPlugin.java
===================================================================
--- plugins/azpeerthrottler/com/aelitis/azureus/plugins/peerthrottler/PeerThrottlerPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/azpeerthrottler/com/aelitis/azureus/plugins/peerthrottler/PeerThrottlerPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.azureus.plugins.peerthrottler;
import java.io.PrintWriter;
Modified: plugins/azrssgen/com/azureus/plugins/azrssgen/RSSFeedGeneratorPlugin.java
===================================================================
--- plugins/azrssgen/com/azureus/plugins/azrssgen/RSSFeedGeneratorPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/azrssgen/com/azureus/plugins/azrssgen/RSSFeedGeneratorPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2008 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.azureus.plugins.azrssgen;
import java.util.*;
Modified: plugins/aztoolbartest/com/vuze/plugins/test/DefaultActivationImpl.java
===================================================================
--- plugins/aztoolbartest/com/vuze/plugins/test/DefaultActivationImpl.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aztoolbartest/com/vuze/plugins/test/DefaultActivationImpl.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -1,7 +1,10 @@
package com.vuze.plugins.test;
+import java.util.Arrays;
+
import org.gudy.azureus2.plugins.ui.UIInstance;
import org.gudy.azureus2.plugins.ui.toolbar.UIToolBarActivationListener;
+import org.gudy.azureus2.plugins.ui.toolbar.UIToolBarManager;
import com.aelitis.azureus.ui.common.ToolBarItem;
@@ -18,10 +21,18 @@
public boolean toolBarItemActivated(ToolBarItem item, long activationType,
Object datasource) {
uiInstance.promptUser("PluginToolBarTest", "Item " + item.getID()
- + " activated!\n\n" + (datasource == null ? "null" : datasource.getClass().getSimpleName()), null, 0);
+ + " activated!\n\n"
+ + (datasource == null ? "null" : datasource.getClass().isArray()
+ ? Arrays.toString((Object[]) datasource)
+ : datasource.getClass().getSimpleName()), null, 0);
+ if (activationType == ACTIVATIONTYPE_HELD) {
+ UIToolBarManager tbm = uiInstance.getToolBarManager();
+ tbm.removeToolBarItem(item.getID());
+ }
// We handled the activation.. return true
return true;
}
+
}
Modified: plugins/aztoolbartest/com/vuze/plugins/test/PluginToolBarTest.java
===================================================================
--- plugins/aztoolbartest/com/vuze/plugins/test/PluginToolBarTest.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aztoolbartest/com/vuze/plugins/test/PluginToolBarTest.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,6 +3,7 @@
import org.gudy.azureus2.plugins.PluginException;
import org.gudy.azureus2.plugins.PluginInterface;
import org.gudy.azureus2.plugins.UnloadablePlugin;
+import org.gudy.azureus2.plugins.ui.UIDataSourceListener;
import org.gudy.azureus2.plugins.ui.UIInstance;
import org.gudy.azureus2.plugins.ui.UIManagerListener;
import org.gudy.azureus2.plugins.ui.toolbar.UIToolBarItem;
@@ -9,13 +10,15 @@
import org.gudy.azureus2.plugins.ui.toolbar.UIToolBarManager;
public class PluginToolBarTest
- implements UnloadablePlugin
+ implements UnloadablePlugin, UIDataSourceListener
{
private UIInstance instance;
+ private PluginInterface pi;
- public void initialize(PluginInterface pi)
+ public void initialize(final PluginInterface pi)
throws PluginException {
+ this.pi = pi;
pi.getUIManager().addUIListener(new UIManagerListener() {
public void UIDetached(UIInstance instance) {
@@ -27,21 +30,27 @@
if (tbm != null) {
UIToolBarItem item1 = tbm.createToolBarItem("plugintest");
item1.setTextID("PluginToolBarTest.toolbar.text");
- item1.setDefaultActivationListener(new DefaultActivationImpl(instance));
+ item1.setDefaultActivationListener(
+ new DefaultActivationImpl(instance));
item1.setState(UIToolBarItem.STATE_ENABLED);
+ item1.setImageID("image.vuze-entry.frog");
tbm.addToolBarItem(item1);
UIToolBarItem item2 = tbm.createToolBarItem("plugintest2");
item2.setTextID("PluginToolBarTest.toolbar.text2");
- item2.setDefaultActivationListener(new DefaultActivationImpl(instance));
- item2.setState(UIToolBarItem.STATE_ENABLED);
+ item2.setDefaultActivationListener(
+ new DefaultActivationImpl(instance));
+ item2.setImageID("image.vuze-entry.frog");
tbm.addToolBarItem(item2);
UIToolBarItem item3 = tbm.createToolBarItem("plugintest3");
item3.setTextID("PluginToolBarTest.toolbar.text3");
- item3.setDefaultActivationListener(new DefaultActivationImpl(instance));
- item3.setState(UIToolBarItem.STATE_ENABLED);
+ item3.setDefaultActivationListener(
+ new DefaultActivationImpl(instance));
+ item3.setImageID("image.vuze-entry.frog");
tbm.addToolBarItem(item3);
+
+ pi.getUIManager().addDataSourceListener(PluginToolBarTest.this, true);
}
}
});
@@ -53,6 +62,19 @@
instance.getToolBarManager().removeToolBarItem("plugintest");
instance.getToolBarManager().removeToolBarItem("plugintest2");
instance.getToolBarManager().removeToolBarItem("plugintest3");
+
+ pi.getUIManager().removeDataSourceListener(this);
}
+ // @see org.gudy.azureus2.plugins.ui.UIDataSourceListener#dataSourceChanged(java.lang.Object)
+ public void dataSourceChanged(Object datasource) {
+ UIToolBarManager tbm = PluginToolBarTest.this.instance.getToolBarManager();
+ if (tbm == null) {
+ return;
+ }
+ tbm.getToolBarItem("plugintest").setState(UIToolBarItem.STATE_ENABLED);
+ tbm.getToolBarItem("plugintest2").setState(UIToolBarItem.STATE_ENABLED);
+ tbm.getToolBarItem("plugintest3").setState(UIToolBarItem.STATE_ENABLED);
+ }
+
}
Modified: plugins/aztorrentmaker/org/parg/azureus/plugins/aztorrentmaker/TorrentMakerPlugin.java
===================================================================
--- plugins/aztorrentmaker/org/parg/azureus/plugins/aztorrentmaker/TorrentMakerPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aztorrentmaker/org/parg/azureus/plugins/aztorrentmaker/TorrentMakerPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2013 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.aztorrentmaker;
import java.util.*;
Modified: plugins/aztrackerurladder/com/azureus/plugins/trackerurladder/TrackerURLAdderPlugin.java
===================================================================
--- plugins/aztrackerurladder/com/azureus/plugins/trackerurladder/TrackerURLAdderPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/aztrackerurladder/com/azureus/plugins/trackerurladder/TrackerURLAdderPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2012 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.azureus.plugins.trackerurladder;
import java.net.URL;
Modified: plugins/azupnpav/com/aelitis/azureus/plugins/upnpmediaserver/UPnPMediaServerContentDirectory.java
===================================================================
--- plugins/azupnpav/com/aelitis/azureus/plugins/upnpmediaserver/UPnPMediaServerContentDirectory.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/azupnpav/com/aelitis/azureus/plugins/upnpmediaserver/UPnPMediaServerContentDirectory.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2009 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.azureus.plugins.upnpmediaserver;
import java.io.File;
Modified: plugins/azupnpav/com/aelitis/azureus/plugins/upnpmediaserver/UPnPMediaServerHTTP.java
===================================================================
--- plugins/azupnpav/com/aelitis/azureus/plugins/upnpmediaserver/UPnPMediaServerHTTP.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/azupnpav/com/aelitis/azureus/plugins/upnpmediaserver/UPnPMediaServerHTTP.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2009 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.azureus.plugins.upnpmediaserver;
import java.io.*;
Modified: plugins/azupnpav/com/aelitis/azureus/plugins/upnpmediaserver/UPnPMediaServerTranscoder.java
===================================================================
--- plugins/azupnpav/com/aelitis/azureus/plugins/upnpmediaserver/UPnPMediaServerTranscoder.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/azupnpav/com/aelitis/azureus/plugins/upnpmediaserver/UPnPMediaServerTranscoder.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2009 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.azureus.plugins.upnpmediaserver;
import java.io.*;
Modified: plugins/btapp/com/vuze/plugin/btapp/BtAppListView.java
===================================================================
--- plugins/btapp/com/vuze/plugin/btapp/BtAppListView.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/btapp/com/vuze/plugin/btapp/BtAppListView.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -23,7 +23,7 @@
import org.gudy.azureus2.ui.swt.plugins.UISWTViewEvent;
import org.gudy.azureus2.ui.swt.plugins.UISWTViewEventListener;
import org.gudy.azureus2.ui.swt.views.table.TableViewSWT;
-import org.gudy.azureus2.ui.swt.views.table.impl.TableViewSWTImpl;
+import org.gudy.azureus2.ui.swt.views.table.impl.TableViewFactory;
import com.aelitis.azureus.ui.common.table.TableColumnCore;
import com.aelitis.azureus.ui.common.table.TableLifeCycleListener;
@@ -242,8 +242,8 @@
Utils.execSWTThread(new Runnable() {
public void run() {
- tv = new TableViewSWTImpl<BtAppDataSource>(BtAppDataSource.class,
- TABLE_ID, TABLE_ID, "name");
+ tv = TableViewFactory.createTableViewSWT(BtAppDataSource.class,
+ TABLE_ID, TABLE_ID, null, "name", 0);
tv.setRowDefaultHeight(80);
tv.setHeaderVisible(true);
Modified: plugins/jpc/com/aelitis/azureus/plugins/jpc/cache/impl/JPCCacheMultiplexerHelper.java
===================================================================
--- plugins/jpc/com/aelitis/azureus/plugins/jpc/cache/impl/JPCCacheMultiplexerHelper.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/jpc/com/aelitis/azureus/plugins/jpc/cache/impl/JPCCacheMultiplexerHelper.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -22,6 +22,7 @@
package com.aelitis.azureus.plugins.jpc.cache.impl;
+import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.*;
@@ -123,7 +124,12 @@
public void receivedRequest( byte[] hash, int piece_index, int start_offset, int length ) {
requests.add( new PieceRequest( hash, piece_index, start_offset, length ) );
Message request = BTMessageManager.createCoreBTRequest( piece_index, start_offset, length );
- peer.getConnection().getIncomingMessageQueue().notifyOfExternalReceive( request );
+ try {
+ peer.getConnection().getIncomingMessageQueue().notifyOfExternalReceive( request );
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
Modified: plugins/jpc/com/aelitis/azureus/plugins/jpc/peer/impl/PeerControllerImpl.java
===================================================================
--- plugins/jpc/com/aelitis/azureus/plugins/jpc/peer/impl/PeerControllerImpl.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/jpc/com/aelitis/azureus/plugins/jpc/peer/impl/PeerControllerImpl.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -23,6 +23,7 @@
package com.aelitis.azureus.plugins.jpc.peer.impl;
+import java.io.IOException;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.util.*;
@@ -294,7 +295,12 @@
}
Message piece = BTMessageManager.createCoreBTPiece( piece_index, start_offset, data );
- peer.getConnection().getIncomingMessageQueue().notifyOfExternalReceive( piece );
+ try {
+ peer.getConnection().getIncomingMessageQueue().notifyOfExternalReceive( piece );
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
public void receivedBye( String reason ) {
Modified: plugins/mlDHT/lbms/plugins/mldht/azureus/AlternativeContactHandler.java
===================================================================
--- plugins/mlDHT/lbms/plugins/mldht/azureus/AlternativeContactHandler.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlDHT/lbms/plugins/mldht/azureus/AlternativeContactHandler.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package lbms.plugins.mldht.azureus;
import java.net.Inet4Address;
Modified: plugins/mlDHT/lbms/plugins/mldht/azureus/UIHelper.java
===================================================================
--- plugins/mlDHT/lbms/plugins/mldht/azureus/UIHelper.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlDHT/lbms/plugins/mldht/azureus/UIHelper.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2013 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package lbms.plugins.mldht.azureus;
import org.gudy.azureus2.plugins.ui.UIInstance;
Modified: plugins/mlDHT/lbms/plugins/mldht/kad/AnnounceResponseHandler.java
===================================================================
--- plugins/mlDHT/lbms/plugins/mldht/kad/AnnounceResponseHandler.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlDHT/lbms/plugins/mldht/kad/AnnounceResponseHandler.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2013 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package lbms.plugins.mldht.kad;
import lbms.plugins.mldht.kad.tasks.PeerLookupTask;
Modified: plugins/mlDHT/lbms/plugins/mldht/kad/RPCServerListener.java
===================================================================
--- plugins/mlDHT/lbms/plugins/mldht/kad/RPCServerListener.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlDHT/lbms/plugins/mldht/kad/RPCServerListener.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package lbms.plugins.mldht.kad;
import java.net.InetSocketAddress;
Modified: plugins/mlab/com/vuze/plugins/mlab/MLabPlugin.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/MLabPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/MLabPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab;
import java.io.InputStream;
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/ActionEvent.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/ActionEvent.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/ActionEvent.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/ActionListener.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/ActionListener.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/ActionListener.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public interface ActionListener {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/AppletContext.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/AppletContext.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/AppletContext.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
import java.net.URL;
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BadLocationException.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BadLocationException.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BadLocationException.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BorderFactory.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BorderFactory.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BorderFactory.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class BorderFactory {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BorderLayout.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BorderLayout.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BorderLayout.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class BorderLayout {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BoxLayout.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BoxLayout.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/BoxLayout.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class BoxLayout {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Clipboard.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Clipboard.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Clipboard.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class Clipboard {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Color.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Color.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Color.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class Color {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Component.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Component.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Component.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Cursor.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Cursor.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Cursor.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class Cursor {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Dimension.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Dimension.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Dimension.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class Dimension {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JApplet.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JApplet.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JApplet.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
import java.net.URL;
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JButton.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JButton.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JButton.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JCheckBox.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JCheckBox.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JCheckBox.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JComboBox.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JComboBox.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JComboBox.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JFrame.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JFrame.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JFrame.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JLabel.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JLabel.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JLabel.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JOptionPane.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JOptionPane.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JOptionPane.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JPanel.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JPanel.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JPanel.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JProgressBar.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JProgressBar.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JProgressBar.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JScrollPane.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JScrollPane.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JScrollPane.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JSpinner.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JSpinner.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JSpinner.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JTextArea.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JTextArea.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JTextArea.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JTextPane.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JTextPane.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/JTextPane.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/MouseAdapter.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/MouseAdapter.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/MouseAdapter.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class MouseAdapter {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/MouseEvent.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/MouseEvent.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/MouseEvent.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class MouseEvent {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Panel.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Panel.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Panel.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/SpinnerNumberModel.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/SpinnerNumberModel.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/SpinnerNumberModel.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/StringSelection.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/StringSelection.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/StringSelection.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class StringSelection {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/StyledDocument.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/StyledDocument.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/StyledDocument.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Tcpbw100UIWrapper.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Tcpbw100UIWrapper.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Tcpbw100UIWrapper.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Tcpbw100UIWrapperListener.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Tcpbw100UIWrapperListener.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Tcpbw100UIWrapperListener.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public interface
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Toolkit.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Toolkit.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/Toolkit.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class Toolkit {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/WindowAdapter.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/WindowAdapter.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/WindowAdapter.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class WindowAdapter {
Modified: plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/WindowEvent.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/WindowEvent.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/tools/ndt/swingemu/WindowEvent.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.tools.ndt.swingemu;
public class WindowEvent {
Modified: plugins/mlab/com/vuze/plugins/mlab/ui/MLabWizard.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/ui/MLabWizard.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/ui/MLabWizard.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.ui;
import java.io.InputStream;
Modified: plugins/mlab/com/vuze/plugins/mlab/ui/MLabWizardNDT.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/ui/MLabWizardNDT.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/ui/MLabWizardNDT.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.ui;
import java.util.Map;
Modified: plugins/mlab/com/vuze/plugins/mlab/ui/MLabWizardStart.java
===================================================================
--- plugins/mlab/com/vuze/plugins/mlab/ui/MLabWizardStart.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/mlab/com/vuze/plugins/mlab/ui/MLabWizardStart.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.mlab.ui;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperAdapter.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperAdapter.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperAdapter.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p;
import java.util.List;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperDHT.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperDHT.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperDHT.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p;
import java.util.Collection;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperDHTAdapter.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperDHTAdapter.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperDHTAdapter.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p;
import org.parg.azureus.plugins.networks.i2p.vuzedht.DHTTransportContactI2P;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperDHTListener.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperDHTListener.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperDHTListener.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p;
import org.parg.azureus.plugins.networks.i2p.vuzedht.DHTTransportContactI2P;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperMessageHandler.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperMessageHandler.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperMessageHandler.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p;
import java.net.InetSocketAddress;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperNetworkMixer.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperNetworkMixer.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperNetworkMixer.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p;
import java.util.*;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperPlugin.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/I2PHelperPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p;
import java.io.BufferedInputStream;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperRouter.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperRouter.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperRouter.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.router;
import java.io.File;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperRouterDHT.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperRouterDHT.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperRouterDHT.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.router;
import java.io.File;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperSocksProxy.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperSocksProxy.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperSocksProxy.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.router;
import java.io.EOFException;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperUtils.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperUtils.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/router/I2PHelperUtils.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.router;
import java.io.File;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/swt/I2PHelperView.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/swt/I2PHelperView.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/swt/I2PHelperView.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2008 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.swt;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/tracker/I2PHelperTracker.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/tracker/I2PHelperTracker.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/tracker/I2PHelperTracker.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.tracker;
import java.util.*;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTAZ.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTAZ.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTAZ.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.vuzedht;
import java.io.File;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTI2P.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTI2P.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTI2P.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.vuzedht;
import java.io.File;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportAZ.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportAZ.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportAZ.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.vuzedht;
import java.io.*;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportContactAZ.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportContactAZ.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportContactAZ.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.vuzedht;
import java.io.DataOutputStream;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportContactI2P.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportContactI2P.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportContactI2P.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.vuzedht;
import java.io.DataOutputStream;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportI2P.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportI2P.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTTransportI2P.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.vuzedht;
import java.io.DataInputStream;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTUtilsI2P.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTUtilsI2P.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/DHTUtilsI2P.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.vuzedht;
import java.io.DataInputStream;
Modified: plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/I2PHelperAZDHT.java
===================================================================
--- plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/I2PHelperAZDHT.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/azi2phelper/org/parg/azureus/plugins/networks/i2p/vuzedht/I2PHelperAZDHT.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.i2p.vuzedht;
import java.net.InetSocketAddress;
Modified: plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPlugin.java
===================================================================
--- plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2013 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.tor;
import java.io.*;
Modified: plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPluginHTTPProxy.java
===================================================================
--- plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPluginHTTPProxy.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPluginHTTPProxy.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2008 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.tor;
import java.net.*;
Modified: plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPluginUI.java
===================================================================
--- plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPluginUI.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/tor/org/parg/azureus/plugins/networks/tor/TorPluginUI.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2013 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.tor;
public interface
Modified: plugins/networks/tor/org/parg/azureus/plugins/networks/tor/swt/TorPluginUISWT.java
===================================================================
--- plugins/networks/tor/org/parg/azureus/plugins/networks/tor/swt/TorPluginUISWT.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/tor/org/parg/azureus/plugins/networks/tor/swt/TorPluginUISWT.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2013 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.tor.swt;
import java.util.*;
Modified: plugins/networks/torbrowser/org/parg/azureus/plugins/networks/torbrowser/TorBrowserPlugin.java
===================================================================
--- plugins/networks/torbrowser/org/parg/azureus/plugins/networks/torbrowser/TorBrowserPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/networks/torbrowser/org/parg/azureus/plugins/networks/torbrowser/TorBrowserPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2014 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package org.parg.azureus.plugins.networks.torbrowser;
import java.io.*;
Modified: plugins/rating/com/aelitis/azureus/plugins/rating/RatingUI.java
===================================================================
--- plugins/rating/com/aelitis/azureus/plugins/rating/RatingUI.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/rating/com/aelitis/azureus/plugins/rating/RatingUI.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2013 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.azureus.plugins.rating;
public interface
Modified: plugins/rating/com/aelitis/azureus/plugins/rating/ui/RatingSWTUI.java
===================================================================
--- plugins/rating/com/aelitis/azureus/plugins/rating/ui/RatingSWTUI.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/rating/com/aelitis/azureus/plugins/rating/ui/RatingSWTUI.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2013 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.aelitis.azureus.plugins.rating.ui;
import java.util.ArrayList;
Modified: plugins/twitter/com/vuze/client/plugins/twitter/TwitterPlugin.java
===================================================================
--- plugins/twitter/com/vuze/client/plugins/twitter/TwitterPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/twitter/com/vuze/client/plugins/twitter/TwitterPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.client.plugins.twitter;
import java.io.File;
Modified: plugins/vzcoreinstaller/com/vuze/plugins/coreinstaller/CoreInstallerPlugin.java
===================================================================
--- plugins/vzcoreinstaller/com/vuze/plugins/coreinstaller/CoreInstallerPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/vzcoreinstaller/com/vuze/plugins/coreinstaller/CoreInstallerPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,22 +3,24 @@
* Created by Paul Gardner
*
* Copyright 2010 Vuze, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package com.vuze.plugins.coreinstaller;
import java.io.File;
Deleted: plugins/xmwebui/aeremsearchplugin.jar
===================================================================
(Binary files differ)
Added: plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPlugin.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPlugin.java (rev 0)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -0,0 +1,447 @@
+/*
+ * Created on Sep 12, 2008
+ * Created by Paul Gardner
+ *
+ * Copyright 2008 Vuze, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+package com.aelitis.azureus.plugins.remsearch;
+
+import java.io.IOException;
+import java.util.*;
+
+import org.gudy.azureus2.core3.config.COConfigurationManager;
+import org.gudy.azureus2.core3.util.Average;
+import org.gudy.azureus2.plugins.Plugin;
+import org.gudy.azureus2.plugins.PluginException;
+import org.gudy.azureus2.plugins.PluginInterface;
+import org.gudy.azureus2.plugins.PluginListener;
+import org.gudy.azureus2.plugins.logging.LoggerChannel;
+import org.gudy.azureus2.plugins.ui.config.IntParameter;
+import org.gudy.azureus2.plugins.ui.model.BasicPluginConfigModel;
+import org.gudy.azureus2.plugins.utils.LocaleUtilities;
+import org.gudy.azureus2.plugins.utils.UTTimer;
+import org.gudy.azureus2.plugins.utils.UTTimerEvent;
+import org.gudy.azureus2.plugins.utils.UTTimerEventPerformer;
+
+import com.aelitis.azureus.core.metasearch.*;
+import com.aelitis.azureus.core.util.CopyOnWriteList;
+import com.aelitis.azureus.core.util.bloom.BloomFilter;
+import com.aelitis.azureus.core.util.bloom.BloomFilterFactory;
+
+public class
+RemSearchPlugin
+ implements Plugin
+{
+ private static final int PORT_DEFAULT = 8888;
+ private static final int SEARCH_TIMEOUT_DEFAULT = 45*1000;
+ private static final int MAX_SEARCHES_DEFAULT = 100;
+ private static final int MAX_RESULTS_PER_ENGINE_DEFAULT = 50;
+ private static final String URL_PREFIX_DEFAULT = "/psearch";
+
+ private static final int TICK_PERIOD = 15*1000;
+ private static final int HISTORY_CLEAR_PERIOD = 300*1000;
+ private static final int HISTORY_CLEAR_PER_TICK = RemSearchPluginEngine.ENGINE_HISTORY_SIZE * TICK_PERIOD / HISTORY_CLEAR_PERIOD;
+
+ private IntParameter search_timeout;
+ private IntParameter max_searches;
+ private IntParameter max_results_per_engine;
+
+ private PluginInterface plugin_interface;
+
+ private LoggerChannel logger;
+
+ private String url_prefix;
+
+ private RemSearchPluginStats stats = new RemSearchPluginStats( this );
+
+ private static final int STATS_PERIOD = 1000;
+ private static final int STATS_DURATION_SECS = 30; // 30 second average
+
+ private Average search_average = Average.getInstance(STATS_PERIOD,STATS_DURATION_SECS);
+
+ private static final int BLOOM_FILTER_SIZE = 256*1024;
+ private static final int BLOOM_ROTATION_PERIOD = 1*60*1000 / 2; // two blooms in rotation so 1 minute life = 2*30 secs
+ private static final int BLOOM_ROTATION_TICKS = BLOOM_ROTATION_PERIOD / TICK_PERIOD;
+ private static final int BLOOM_MAX_HITS_PER_PERIOD = 15; //
+
+ private Object bloom_lock = new Object();
+ private BloomFilter bloom_one = BloomFilterFactory.createAddRemove8Bit( BLOOM_FILTER_SIZE );
+ private BloomFilter bloom_two = BloomFilterFactory.createAddRemove8Bit( BLOOM_FILTER_SIZE );
+
+ private String host_name = "relay";
+
+ private CopyOnWriteList listeners = new CopyOnWriteList();
+
+ private RemSearchPluginPageGenerator generator;
+
+ public void
+ load(
+ PluginInterface pi )
+ {
+ COConfigurationManager.setParameter( "Tracker IP", "127.0.0.1" );
+
+ COConfigurationManager.setParameter(
+ "Tracker Port",
+ COConfigurationManager.getIntParameter( "Plugin.aeremsearch.aeremsearch.config.http_port", PORT_DEFAULT ));
+
+ COConfigurationManager.setParameter( "Tracker Port Enable", true );
+
+ COConfigurationManager.setParameter( "Tracker TCP NonBlocking", true );
+
+ COConfigurationManager.setParameter( "Tracker TCP NonBlocking Immediate Close", true );
+
+ COConfigurationManager.setParameter( "Tracker TCP NonBlocking Restrict Request Types", false );
+ }
+
+ public void
+ initialize(
+ PluginInterface _plugin_interface )
+
+ throws PluginException
+ {
+ plugin_interface = _plugin_interface;
+
+ logger = plugin_interface.getLogger().getChannel( "RemoteSearch" );
+
+ logger.setDiagnostic();
+
+ LocaleUtilities loc_utils = plugin_interface.getUtilities().getLocaleUtilities();
+
+ loc_utils.integrateLocalisedMessageBundle( "com.aelitis.azureus.plugins.remsearch.internat.Messages" );
+
+ BasicPluginConfigModel config_model =
+ plugin_interface.getUIManager().createBasicPluginConfigModel( "aeremsearch.name" );
+
+ config_model.addIntParameter2( "aeremsearch.config.http_port", "aeremsearch.config.http_port", PORT_DEFAULT );
+
+
+ search_timeout = config_model.addIntParameter2( "aeremsearch.config.search_timeout", "aeremsearch.config.search_timeout", SEARCH_TIMEOUT_DEFAULT );
+ max_searches = config_model.addIntParameter2( "aeremsearch.config.max_searches", "aeremsearch.config.max_searches", MAX_SEARCHES_DEFAULT );
+ max_results_per_engine = config_model.addIntParameter2( "aeremsearch.config.max_results_per_engine", "aeremsearch.config.max_results_per_engine", MAX_RESULTS_PER_ENGINE_DEFAULT );
+
+ url_prefix = config_model.addStringParameter2( "aeremsearch.config.url_prefix", "aeremsearch.config.url_prefix", URL_PREFIX_DEFAULT ).getValue();
+
+ if ( url_prefix.endsWith( "/" )){
+
+ url_prefix = url_prefix.substring( 0, url_prefix.length()-1);
+ }
+
+ String host = System.getProperty( "az.hostname" );
+
+ if ( host != null && host.length() > 0 ){
+
+ host_name = host;
+ }
+
+ generator =
+ new RemSearchPluginPageGenerator(
+ new RemSearchPluginPageGeneratorAdaptor()
+ {
+ public void
+ searchReceived(
+ String originator )
+
+ throws IOException
+ {
+ byte[] bloom_key = originator.getBytes();
+
+ synchronized( bloom_lock ){
+
+ bloom_two.add( bloom_key );
+
+ if ( bloom_one.add( bloom_key ) > BLOOM_MAX_HITS_PER_PERIOD ){
+
+ throw( new IOException( "Too many recent searches from " + originator ));
+ }
+ }
+ }
+
+ public void
+ searchCreated(
+ RemSearchPluginSearch search )
+ {
+ Iterator<RemSearchPluginListener> it = listeners.iterator();
+
+ while( it.hasNext()){
+
+ try{
+ it.next().searchCreated(search);
+
+ }catch( Throwable e ){
+
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public void
+ log(
+ String str )
+ {
+ RemSearchPlugin.this.log( str );
+ };
+
+ public void
+ log(
+ String str,
+ Throwable e )
+ {
+ RemSearchPlugin.this.log( str, e );
+ };
+ },
+ url_prefix,
+ host_name,
+ max_searches.getValue(),
+ max_results_per_engine.getValue(),
+ true );
+
+ plugin_interface.addListener(
+ new PluginListener()
+ {
+ public void
+ initializationComplete()
+ {
+ MetaSearchManager meta_search = MetaSearchManagerFactory.getSingleton();
+
+ if ( !meta_search.isAutoMode()){
+
+ try{
+ meta_search.setSelectedEngines( new long[0], true );
+
+ }catch( Throwable e ){
+
+ log( "Failed to set auto-mode", e );
+ }
+ }
+
+ plugin_interface.getTracker().addPageGenerator( generator );
+
+ UTTimer timer = plugin_interface.getUtilities().createTimer( "Search timer", true );
+
+ // stats
+
+ timer.addPeriodicEvent(
+ STATS_PERIOD,
+ new UTTimerEventPerformer()
+ {
+ private long last_total_searches;
+
+ public void
+ perform(
+ UTTimerEvent event )
+ {
+ // track searches per minute
+
+ long ts = generator.getTotalSearches();
+
+ search_average.addValue( ts - last_total_searches );
+
+ last_total_searches = ts;
+ }
+ });
+
+
+ timer.addPeriodicEvent(
+ TICK_PERIOD,
+ new UTTimerEventPerformer()
+ {
+ private int tick_count;
+
+ public void
+ perform(
+ UTTimerEvent event )
+ {
+ tick_count++;
+
+ // timeouts
+
+ int timeout = search_timeout.getValue();
+
+ Map<String,RemSearchPluginSearch> searches = generator.getSearches();
+
+ Iterator<RemSearchPluginSearch> it = searches.values().iterator();
+
+ while( it.hasNext()){
+
+ RemSearchPluginSearch search = it.next();
+
+ if ( search.getAge() > timeout ){
+
+ log( "Timeout: " + search.getString());
+
+ search.destroy();
+ }
+ }
+
+ String history_str = "";
+
+ Map<Engine, RemSearchPluginEngine> engine_map = generator.getEngineMap();
+
+ for (Map.Entry<Engine,RemSearchPluginEngine> entry: engine_map.entrySet()){
+
+ Engine engine = entry.getKey();
+ RemSearchPluginEngine p_engine = entry.getValue();
+
+ LinkedList<Boolean> history = p_engine.getHistory();
+
+ int good = 0;
+ int first_good = -1;
+ int bad = 0;
+ int first_bad = -1;
+
+ int pos = 0;
+
+ for ( boolean success: history ){
+
+ pos++;
+
+ if ( success ){
+
+ good++;
+
+ if ( first_good == -1 ){
+
+ first_good = pos;
+ }
+ }else{
+
+ bad++;
+
+ if ( first_bad == -1 ){
+
+ first_bad = pos;
+ }
+ }
+ }
+
+ history_str += history_str.length()==0?"":"; ";
+
+ history_str +=
+ engine.getName() +
+ "={h:" + history.size() +
+ ",g=" + good +
+ ",b=" + bad +
+ ",fg=" + first_good +
+ ",fb=" + first_bad +
+ ",rta=" + p_engine.getResponseTimeAverage() + "}";
+
+ if ( history.size() <= HISTORY_CLEAR_PER_TICK ){
+
+ history.clear();
+
+ }else{
+
+ for (int i=0;i<HISTORY_CLEAR_PER_TICK;i++){
+
+ history.removeLast();
+ }
+ }
+ }
+
+ log( "History: search/sec=" + search_average.getDoubleAverageAsString(3) + ", " + history_str );
+
+ if ( tick_count % BLOOM_ROTATION_TICKS == 0 ){
+
+ synchronized( bloom_lock ){
+
+ log( "Bloom rotate: one=" + bloom_one.getEntryCount() + ", two=" + bloom_two.getEntryCount());
+
+ bloom_one = bloom_two;
+
+ bloom_two = BloomFilterFactory.createAddRemove8Bit( BLOOM_FILTER_SIZE );
+ }
+ }
+ }
+ });
+ }
+
+ public void
+ closedownInitiated()
+ {
+
+ }
+
+ public void
+ closedownComplete()
+ {
+
+ }
+ });
+ }
+
+ public RemSearchPluginEngine[]
+ getEngines()
+ {
+ return( generator.getEngines());
+ }
+
+ public RemSearchPluginStats
+ getStats()
+ {
+ return( stats );
+ }
+
+ public long
+ getTotalSearches()
+ {
+ return( generator.getTotalSearches());
+ }
+
+ public long
+ getTotalSearchesFailed()
+ {
+ return( generator.getTotalSearchesFailed());
+ }
+
+ public long
+ getTotalEnginesFailed()
+ {
+ return( generator.getTotalEnginesFailed());
+ }
+
+
+ public void
+ addListener(
+ RemSearchPluginListener listener )
+ {
+ listeners.add( listener );
+ }
+
+ public void
+ removeListener(
+ RemSearchPluginListener listener )
+ {
+ listeners.remove( listener );
+ }
+
+ protected void
+ log(
+ String str )
+ {
+ logger.log( str );
+ }
+
+ protected void
+ log(
+ String str,
+ Throwable e )
+ {
+ logger.log( str, e );
+ }
+}
Added: plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginEngine.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginEngine.java (rev 0)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginEngine.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -0,0 +1,116 @@
+/*
+ * Created on Nov 7, 2008
+ * Created by Paul Gardner
+ *
+ * Copyright 2008 Vuze, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+package com.aelitis.azureus.plugins.remsearch;
+
+import java.util.*;
+
+import com.aelitis.azureus.core.metasearch.Engine;
+import com.aelitis.azureus.core.util.average.Average;
+import com.aelitis.azureus.core.util.average.AverageFactory;
+
+public abstract class
+RemSearchPluginEngine
+{
+ protected static final int ENGINE_HISTORY_SIZE = 100;
+
+ private long success_count;
+ private long fail_count;
+
+ private LinkedList<Boolean> history = new LinkedList<Boolean>();
+
+ private Average response_time_average = AverageFactory.MovingImmediateAverage( 100 );
+ private long latest_rta;
+
+ public abstract String
+ getName();
+
+ public abstract String
+ getUID();
+
+ public abstract String
+ getIcon();
+
+ public abstract String
+ getDownloadLinkCSS();
+
+ public abstract int
+ getSelectionState();
+
+ public abstract int
+ getSource();
+
+ public abstract Engine
+ getEngine();
+
+ public long
+ getSuccessCount()
+ {
+ return( success_count );
+ }
+
+ public long
+ getFailureCount()
+ {
+ return( fail_count );
+ }
+
+ public long
+ getResponseTimeAverage()
+ {
+ return( latest_rta );
+ }
+
+ protected LinkedList<Boolean>
+ getHistory()
+ {
+ return( history );
+ }
+
+ protected void
+ addHistory(
+ boolean ok,
+ long elapsed )
+ {
+ // no sync required as caller always holds monitor
+
+ history.addFirst( ok );
+
+ if ( history.size() > ENGINE_HISTORY_SIZE ){
+
+ history.removeLast();
+ }
+
+ if ( ok ){
+
+ success_count++;
+
+ if ( elapsed > 0 ){
+
+ latest_rta = (long)response_time_average.update( elapsed );
+ }
+ }else{
+
+ fail_count++;
+ }
+ }
+}
Added: plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginEngineReal.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginEngineReal.java (rev 0)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginEngineReal.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -0,0 +1,83 @@
+/*
+ * Created on Jan 11, 2014
+ * Created by Paul Gardner
+ *
+ * Copyright 2014 Azureus Software, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+package com.aelitis.azureus.plugins.remsearch;
+
+
+import com.aelitis.azureus.core.metasearch.Engine;
+
+public class
+RemSearchPluginEngineReal
+ extends RemSearchPluginEngine
+{
+ private Engine engine;
+
+
+ protected
+ RemSearchPluginEngineReal(
+ Engine _engine )
+ {
+ engine = _engine;
+ }
+
+ public Engine
+ getEngine()
+ {
+ return( engine );
+ }
+
+ public String
+ getName()
+ {
+ return( engine.getName());
+ }
+
+ public String
+ getUID()
+ {
+ return( engine.getUID());
+ }
+
+ public String
+ getIcon()
+ {
+ return( engine.getIcon());
+ }
+
+ public String
+ getDownloadLinkCSS()
+ {
+ return( engine.getDownloadLinkCSS());
+ }
+
+ public int
+ getSelectionState()
+ {
+ return( engine.getSelectionState());
+ }
+
+ public int
+ getSource()
+ {
+ return( engine.getSource());
+ }
+}
Added: plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginListener.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginListener.java (rev 0)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginListener.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -0,0 +1,31 @@
+/*
+ * Created on Nov 18, 2008
+ * Created by Paul Gardner
+ *
+ * Copyright 2008 Vuze, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+package com.aelitis.azureus.plugins.remsearch;
+
+public interface
+RemSearchPluginListener
+{
+ public void
+ searchCreated(
+ RemSearchPluginSearch search );
+}
Added: plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginPageGenerator.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginPageGenerator.java (rev 0)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginPageGenerator.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -0,0 +1,894 @@
+/*
+ * Created on Jan 27, 2010
+ * Created by Paul Gardner
+ *
+ * Copyright 2010 Vuze, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+package com.aelitis.azureus.plugins.remsearch;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.gudy.azureus2.core3.util.Debug;
+import org.gudy.azureus2.plugins.tracker.web.TrackerWebPageGenerator;
+import org.gudy.azureus2.plugins.tracker.web.TrackerWebPageRequest;
+import org.gudy.azureus2.plugins.tracker.web.TrackerWebPageResponse;
+import org.json.simple.JSONObject;
+
+import com.aelitis.azureus.core.metasearch.Engine;
+import com.aelitis.azureus.core.metasearch.MetaSearchManager;
+import com.aelitis.azureus.core.metasearch.MetaSearchManagerFactory;
+import com.aelitis.azureus.core.metasearch.Result;
+import com.aelitis.azureus.core.metasearch.SearchParameter;
+import com.aelitis.azureus.core.subs.Subscription;
+import com.aelitis.azureus.core.subs.SubscriptionHistory;
+import com.aelitis.azureus.core.subs.SubscriptionManagerFactory;
+import com.aelitis.azureus.core.subs.SubscriptionResult;
+
+public class
+RemSearchPluginPageGenerator
+ implements TrackerWebPageGenerator
+{
+ private final boolean MATURE_DEFAULT = false;
+
+ private final String SEARCH_PREFIX;
+ private final String RESULTS_PREFIX;
+
+ private final String url_prefix;
+ private final String host_name;
+ private final int max_searches;
+ private final int max_results_per_engine;
+
+ private RemSearchPluginPageGeneratorAdaptor adapter;
+
+ private Map<String,RemSearchPluginSearch> searches = new HashMap<String, RemSearchPluginSearch>();
+
+ private Map<Engine, RemSearchPluginEngine> engine_map = new HashMap<Engine, RemSearchPluginEngine>();
+ private Map<String, RemSearchPluginEngine> engine_eid_map = new HashMap<String, RemSearchPluginEngine>();
+
+ private long total_searches;
+ private long total_fails;
+ private long total_engine_fails;
+ private boolean supports_async;
+
+ private Random random = new Random();
+
+ public
+ RemSearchPluginPageGenerator(
+ RemSearchPluginPageGeneratorAdaptor _adapter,
+ String _url_prefix,
+ String _host_name,
+ int _max_searches,
+ int _max_results_per_engine,
+ boolean _supports_async )
+ {
+ adapter = _adapter;
+ url_prefix = _url_prefix;
+ host_name = _host_name;
+ max_searches = _max_searches;
+ max_results_per_engine = _max_results_per_engine;
+ supports_async = _supports_async;
+
+ SEARCH_PREFIX = _url_prefix + "/search?";
+ RESULTS_PREFIX = _url_prefix + "/get-results?";
+ }
+
+ protected MetaSearchManager
+ getMetaSearchManager()
+ {
+ return( MetaSearchManagerFactory.getSingleton());
+ }
+
+ protected boolean
+ supportsAsync()
+ {
+ return( supports_async );
+ }
+
+ public boolean
+ generate(
+ TrackerWebPageRequest request,
+ TrackerWebPageResponse response )
+
+ throws IOException
+ {
+ String url = request.getURL();
+
+ log( "HTTP request from " + request.getClientAddress());
+
+ boolean json_output = false;
+
+ if ( url.startsWith( SEARCH_PREFIX )){
+
+ String[] args = url.substring( SEARCH_PREFIX.length()).trim().split("&");
+
+ String term = null;
+ boolean mature = MATURE_DEFAULT;
+
+ for (int i=0;i<args.length;i++){
+
+ String[] bits = args[i].split("=", 2 );
+
+ if ( bits.length != 2 ){
+
+ continue;
+ }
+
+ String lhs = bits[0].toLowerCase();
+ String rhs = URLDecoder.decode( bits[1], "UTF-8" );
+
+ if ( lhs.equals( "q" )){
+
+ term = rhs;
+
+ }else if ( lhs.equals( "mature" )){
+
+ mature = rhs.equalsIgnoreCase( "true" );
+
+ }else if ( lhs.equals( "format" )){
+
+ if ( rhs.equalsIgnoreCase( "json" )){
+
+ json_output = true;
+ }
+ }
+ }
+
+ if ( term == null ){
+
+ term = "";
+ //throw( new IOException( "search term missing" ));
+ }
+
+ String mature_str = mature?"true":"false";
+
+ String search_headers = null; // Note this is disctinct from request headers!!!!
+
+ String client_ip = getOriginator( request );
+
+ handleSearch( client_ip, term, mature_str, search_headers, request, response, json_output );
+
+ return( true );
+
+ }else if ( url.startsWith( RESULTS_PREFIX )){
+
+ String[] args = url.substring( RESULTS_PREFIX.length()).trim().split( "&" );
+
+ String sid = null;
+ String eid = null;
+
+ for (int i=0;i<args.length;i++){
+
+ String[] bits = args[i].split("=");
+
+ if ( bits.length != 2 ){
+
+ continue;
+ }
+
+ String lhs = bits[0].toLowerCase();
+ String rhs = URLDecoder.decode( bits[1], "UTF-8" );
+
+ if ( lhs.equals( "sid" )){
+
+ sid = rhs;
+
+ }else if ( lhs.equals( "eid" )){
+
+ eid = rhs;
+
+ }else if ( lhs.equals( "format" )){
+
+ if ( rhs.equalsIgnoreCase( "json" )){
+
+ json_output = true;
+ }
+ }
+ }
+
+ if ( sid == null || eid == null ){
+
+ throw( new IOException( "sid or eid missing" ));
+ }
+
+ handleGetResult( sid, eid, response, json_output );
+
+ return( true );
+
+ }else{
+
+ return( false );
+ }
+ }
+
+ protected void
+ handleSearch(
+ String originator,
+ String expr,
+ String mature,
+ String search_headers,
+ TrackerWebPageRequest request,
+ TrackerWebPageResponse response,
+ boolean json_output )
+ {
+ total_searches++;
+
+ boolean result_sent = false;
+
+ if ( json_output ){
+
+ response.setContentType( "application/json" );
+
+ }else{
+
+ response.setContentType( "application/javascript" );
+ }
+
+ OutputStream os = response.getOutputStream();
+
+ PrintWriter pw = new PrintWriter( new OutputStreamWriter( os ));
+
+ RemSearchPluginSearch search = null;
+
+ try{
+ adapter.searchReceived( originator );
+
+ List<SearchParameter> sps = new ArrayList<SearchParameter>();
+
+ sps.add( new SearchParameter( "s", expr ));
+
+ if ( mature != null ){
+
+ sps.add( new SearchParameter( "m", mature.toString()));
+ }
+
+ SearchParameter[] parameters = sps.toArray( new SearchParameter[ sps.size()]);
+
+ search = new RemSearchPluginSearch( this, request.getHeader(), originator, expr, json_output );
+
+ adapter.searchCreated( search );
+
+ synchronized( searches ){
+
+ searches.put( search.getSID(), search );
+
+ if ( searches.size() > max_searches ){
+
+ throw( new IOException( "Too many active searches" ));
+ }
+ }
+
+ String path = url_prefix;
+
+ if ( path.length() == 0 ){
+
+ path = "/";
+ }
+
+ if ( host_name != null && host_name.length() > 0 ){
+
+ response.setHeader( "Set-Cookie", "JSESSIONID=" + search.getSID() + "." + host_name + "; path=" + path );
+ }
+
+ log( "Created: " + search.getSID() + ": origin=" + originator );
+
+ Map<String,String> context = new HashMap();
+
+ context.put( Engine.SC_SOURCE, "usearch" );
+
+ context.put( Engine.SC_REMOVE_DUP_HASH, "true" );
+
+ RemSearchPluginEngine[] plugin_engines = new RemSearchPluginEngine[0];
+
+ boolean is_subs = expr.startsWith( "Subscription:" );
+
+ if ( is_subs ){
+
+ int pos1 = expr.lastIndexOf( '(' );
+ int pos2 = expr.indexOf( ')', pos1+1 );
+
+ Subscription subscription = null;
+ Engine engine = null;
+
+ if ( pos1 != -1 && pos2 != -1 ){
+
+ String sub_id = expr.substring( pos1+1, pos2 );
+
+ subscription = SubscriptionManagerFactory.getSingleton().getSubscriptionByID( sub_id );
+
+ if ( subscription != null ){
+
+ RemSearchPluginEngine plugin_engine = getEngine( subscription );
+
+ if ( plugin_engine != null ){
+
+ engine = plugin_engine.getEngine();
+
+ plugin_engines = new RemSearchPluginEngine[]{ getEngine( subscription ) };
+ }
+ }
+ }
+
+ search.setEngines( plugin_engines );
+
+ if ( engine != null ){
+
+ SubscriptionHistory history = subscription.getHistory();
+
+ SubscriptionResult[] subs_results = history.getResults( false );
+
+ if ( subs_results.length > max_results_per_engine ){
+
+ SubscriptionResult[] trimmed = new SubscriptionResult[ max_results_per_engine ];
+
+ System.arraycopy( subs_results, 0, trimmed, 0, max_results_per_engine );
+
+ subs_results = trimmed;
+ }
+
+ search.resultsReceived( engine, subs_results );
+
+ search.resultsComplete( engine );
+ }
+ }else{
+
+ Engine[] engines = getEnginesToUse();
+
+ if ( engines.length == 0 ){
+
+ throw( new IOException( "No templates available for searching" ));
+ }
+
+ engines = getMetaSearchManager().getMetaSearch().search( engines, search, parameters, search_headers, context, max_results_per_engine );
+
+ if ( engines.length == 0 ){
+
+ throw( new IOException( "No templates available for searching" ));
+ }
+
+ plugin_engines = new RemSearchPluginEngine[ engines.length ];
+
+ for ( int i=0;i<engines.length;i++ ){
+
+ plugin_engines[i] = getEngine( engines[i] );
+ }
+
+ search.setEngines( plugin_engines );
+ }
+
+ JSONObject result = new JSONObject();
+
+ result.put("sid", search.getSID());
+
+ ArrayList<Map<String,Object>> engine_list = new ArrayList<Map<String,Object>>();
+
+ for (int i=0;i<plugin_engines.length;i++){
+
+ RemSearchPluginEngine engine = plugin_engines[i];
+
+ Map<String,Object> engine_map = (Map<String,Object>)new JSONObject();
+
+ getEngineDetails( engine, engine_map );
+
+ engine_list.add( engine_map );
+ }
+
+ result.put("engines", engine_list );
+
+ result_sent = true;
+
+ if ( json_output ){
+
+ pw.println( result.toString());
+
+ }else{
+
+ pw.println( "webSearch.setup(" + result.toString() + ")" );
+ }
+
+ pw.flush();
+
+ }catch( Throwable e ){
+
+ log( "Search failed", e );
+
+ total_fails++;
+
+ if ( !result_sent ){
+
+ JSONObject error_map = new JSONObject();
+
+ if ( search != null ){
+
+ error_map.put("sid", search.getSID());
+ }
+
+ error_map.put( "error", Debug.getNestedExceptionMessage(e));
+
+ if ( json_output ){
+
+ pw.println( error_map.toString());
+
+ }else{
+
+ pw.println( "webSearch.failed(" + error_map.toString() + ")" );
+ }
+
+ pw.flush();
+ }
+ }
+ }
+
+ protected Engine[]
+ getEnginesToUse()
+ {
+ Engine[] engines = getMetaSearchManager().getMetaSearch().getEngines( true, true );
+
+ List<Engine> engines_to_use = new ArrayList<Engine>();
+
+ synchronized( searches ){
+
+ for ( Engine engine: engines ){
+
+ LinkedList<Boolean> history = getEngine( engine ).getHistory();
+
+ if ( history.size() < 10 ){
+
+ engines_to_use.add( engine );
+
+ }else{
+
+ int bad = 0;
+ int good = 0;
+
+ int first_bad = -1;
+ int first_good = -1;
+
+ int pos = 0;
+
+ boolean add = false;
+
+ for ( boolean success: history ){
+
+ pos++;
+
+ if ( success ){
+
+ good++;
+
+ if ( first_good == -1 ){
+
+ first_good = pos;
+ }
+ }else{
+
+ bad++;
+
+ if ( first_bad == -1 ){
+
+ first_bad = pos;
+ }
+ }
+ }
+
+ // don't let an intermittent fail stop engine use
+
+ if ( first_good <= 10 ){
+
+ add = true;
+
+ }else{
+
+ // not looking so good
+
+ int rand;
+
+ if ( first_good == -1 ){
+
+ rand = history.size();
+
+ }else{
+
+ rand = bad;
+ }
+
+ add = random.nextInt( rand ) == 0;
+ }
+
+ if ( add ){
+
+ engines_to_use.add( engine );
+ }
+ }
+ }
+ }
+
+ return( engines_to_use.toArray( new Engine[ engines_to_use.size()]));
+ }
+
+ protected void
+ handleGetResult(
+ String sid,
+ String eid,
+ TrackerWebPageResponse response,
+ boolean json_output )
+ {
+ RemSearchPluginSearch search;
+
+ if ( json_output ){
+
+ response.setContentType( "application/json" );
+
+ }else{
+
+ response.setContentType( "application/javascript" );
+ }
+
+ synchronized( searches ){
+
+ search = searches.get( sid );
+ }
+
+ try{
+ if ( search != null ){
+
+ search.handleResultReceiver( eid, response );
+
+ }else{
+
+ throw( new IOException( "Search '" + sid + " not found" ));
+ }
+ }catch( Throwable failure ){
+
+ log( "Search " + sid + "/" + eid + ": " + Debug.getNestedExceptionMessage( failure ));
+
+ RemSearchPluginEngine engine;
+
+ synchronized( searches ){
+
+ engine = engine_eid_map.get( eid );
+ }
+
+ Map<String,Object> error_map = (Map<String,Object>)new JSONObject();
+
+ error_map.put( "error", Debug.getNestedExceptionMessage( failure ));
+
+ error_map.put("sid", sid);
+
+ if ( engine != null ){
+
+ getEngineDetails( engine, error_map );
+
+ }else{
+
+ error_map.put("id", eid );
+ }
+
+ try{
+ PrintWriter pw = new PrintWriter( new OutputStreamWriter( response.getOutputStream(), "UTF-8" ));
+
+ if ( json_output ){
+
+ pw.println( error_map.toString());
+
+ }else{
+
+ pw.println( "webSearch.engineFailed(" + error_map.toString() + ")" );
+ }
+
+ pw.flush();
+
+ }catch( Throwable e ){
+ }
+ }
+ }
+
+ protected void
+ complete(
+ RemSearchPluginSearch search,
+ List<RemSearchPluginSearch.engineResult> ok,
+ List<RemSearchPluginSearch.engineResult> failed )
+ {
+ synchronized( searches ){
+
+ if ( searches.remove( search.getSID()) == null ){
+
+ return;
+ }
+
+ log( "Complete: " + search.getSID() + ", elapsed=" + search.getAge());
+
+ if ( ok.size() == 0 ){
+
+ total_fails++;
+ }
+
+ total_engine_fails += failed.size();
+
+ for ( RemSearchPluginSearch.engineResult result: ok ){
+
+ addEngineResult( result, true );
+ }
+
+ for ( RemSearchPluginSearch.engineResult result: failed ){
+
+ addEngineResult( result, false );
+ }
+ }
+ }
+
+ public RemSearchPluginEngine[]
+ getEngines()
+ {
+ Engine[] engines = getMetaSearchManager().getMetaSearch().getEngines( true, true );
+
+ List<RemSearchPluginEngine> result = new ArrayList<RemSearchPluginEngine>();
+
+ synchronized( searches ){
+
+ for ( Engine engine: engines ){
+
+ RemSearchPluginEngine e = engine_map.get( engine );
+
+ if ( e == null ){
+
+ e = new RemSearchPluginEngineReal( engine );
+
+ engine_map.put( engine, e );
+
+ engine_eid_map.put( engine.getUID(), e );
+ }
+
+ result.add( e );
+ }
+ }
+
+ return( result.toArray( new RemSearchPluginEngine[result.size()]));
+ }
+
+ protected RemSearchPluginEngine
+ getEngine(
+ Engine engine )
+ {
+ synchronized( searches ){
+
+ RemSearchPluginEngine e = engine_map.get( engine );
+
+ if ( e == null ){
+
+ e = new RemSearchPluginEngineReal( engine );
+
+ engine_map.put( engine, e );
+
+ engine_eid_map.put( engine.getUID(), e );
+ }
+
+ return( e );
+ }
+ }
+
+ protected RemSearchPluginEngine
+ getEngine(
+ Subscription subscription )
+ {
+ synchronized( searches ){
+
+ try{
+ Engine engine = subscription.getEngine();
+
+ RemSearchPluginEngine e = engine_map.get( engine );
+
+ if ( e == null ){
+
+ e = new RemSearchPluginEngineReal( engine );
+
+ engine_map.put( engine, e );
+
+ engine_eid_map.put( engine.getUID(), e );
+ }
+
+ return( e );
+
+ }catch( Throwable e ){
+
+ Debug.out( e );
+
+ return( null );
+ }
+ }
+ }
+
+ protected void
+ addEngineResult(
+ RemSearchPluginSearch.engineResult result,
+ boolean ok )
+ {
+ result.getEngine().addHistory( ok, result.getSearchElapsedTime());
+ }
+
+ protected static void
+ getEngineDetails(
+ RemSearchPluginEngine engine,
+ Map<String,Object> map )
+ {
+ map.put("name", engine.getName() );
+ map.put("id", engine.getUID());
+ map.put("favicon", engine.getIcon());
+ map.put("dl_link_css", engine.getDownloadLinkCSS());
+ map.put("selected", Engine.SEL_STATE_STRINGS[ engine.getSelectionState()]);
+ map.put("type", Engine.ENGINE_SOURCE_STRS[ engine.getSource()]);
+ }
+
+ protected String
+ getOriginator(
+ TrackerWebPageRequest request )
+ {
+ String input_header = request.getHeader();
+ String lowercase_input_header = input_header.toLowerCase();
+
+ String client_ip = getRequestHeader( input_header, lowercase_input_header, "real-ip" );
+
+ if ( client_ip == null ){
+
+ client_ip = getRequestHeader( input_header, lowercase_input_header, "client-ip" );
+ }
+
+ if ( client_ip == null ){
+
+ client_ip = getRequestHeader( input_header, lowercase_input_header, "forwarded-for" );
+ }
+
+ if ( client_ip == null ){
+
+ return( request.getClientAddress());
+
+ }else{
+
+ int pos = client_ip.indexOf(',');
+
+ if ( pos != -1 ){
+
+ client_ip = client_ip.substring(0,pos);
+ }
+
+ try{
+ InetAddress originator_host = InetAddress.getByName( client_ip.trim());
+
+ if ( originator_host.isLinkLocalAddress() ||
+ originator_host.isSiteLocalAddress() ||
+ originator_host.isLoopbackAddress()){
+
+ log( "Bad client IP '" + client_ip + "'" );
+
+ return( request.getClientAddress());
+
+ }else{
+
+ return( originator_host.getHostAddress());
+ }
+
+ }catch( Throwable e ){
+
+ log( "Bad client IP '" + client_ip + "'" );
+
+ return( request.getClientAddress());
+ }
+ }
+ }
+
+ protected String
+ getRequestHeader(
+ String str,
+ String lc_str,
+ String name )
+ {
+ // pick up "name" and "x-name"
+
+ int pos1 = lc_str.indexOf( name );
+
+ if ( pos1 == -1 ){
+
+ return( null );
+ }
+
+ int pos2 = lc_str.indexOf( "\r\n", pos1 );
+
+ String entry;
+
+ if ( pos2 == -1 ){
+
+ entry = str.substring( pos1 );
+
+ }else{
+
+ entry = str.substring( pos1, pos2 );
+ }
+
+ int pos = entry.indexOf(':');
+
+ if ( pos == -1 ){
+
+ return( null );
+ }
+
+ return( entry.substring( pos+1 ).trim());
+ }
+
+ public Map<String,RemSearchPluginSearch>
+ getSearches()
+ {
+ synchronized( searches ){
+
+ return( new HashMap<String,RemSearchPluginSearch>( searches ));
+ }
+ }
+
+ protected Map<Engine, RemSearchPluginEngine>
+ getEngineMap()
+ {
+ synchronized( searches ){
+
+ return( new HashMap<Engine, RemSearchPluginEngine>( engine_map ));
+ }
+ }
+
+ protected long
+ getTotalSearches()
+ {
+ return( total_searches );
+ }
+
+ protected long
+ getTotalSearchesFailed()
+ {
+ return( total_fails);
+ }
+
+ protected long
+ getTotalEnginesFailed()
+ {
+ return( total_engine_fails );
+ }
+
+ protected void
+ log(
+ String str )
+ {
+ adapter.log( str );
+ }
+
+ protected void
+ log(
+ String str,
+ Throwable e )
+ {
+ adapter.log( str, e );
+ }
+}
Added: plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginPageGeneratorAdaptor.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginPageGeneratorAdaptor.java (rev 0)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginPageGeneratorAdaptor.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -0,0 +1,48 @@
+/*
+ * Created on Jan 27, 2010
+ * Created by Paul Gardner
+ *
+ * Copyright 2010 Vuze, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+package com.aelitis.azureus.plugins.remsearch;
+
+import java.io.IOException;
+
+public interface
+RemSearchPluginPageGeneratorAdaptor
+{
+ public void
+ log(
+ String str );
+
+ public void
+ log(
+ String str,
+ Throwable e );
+
+ public void
+ searchReceived(
+ String originator )
+
+ throws IOException;
+
+ public void
+ searchCreated(
+ RemSearchPluginSearch search );
+}
Added: plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginSearch.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginSearch.java (rev 0)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginSearch.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -0,0 +1,631 @@
+/*
+ * Created on Sep 12, 2008
+ * Created by Paul Gardner
+ *
+ * Copyright 2008 Vuze, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+package com.aelitis.azureus.plugins.remsearch;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.util.*;
+
+import org.gudy.azureus2.core3.util.AESemaphore;
+import org.gudy.azureus2.core3.util.Base32;
+import org.gudy.azureus2.core3.util.Debug;
+import org.gudy.azureus2.core3.util.RandomUtils;
+import org.gudy.azureus2.core3.util.SystemTime;
+import org.gudy.azureus2.plugins.tracker.web.TrackerWebPageResponse;
+import org.json.simple.JSONObject;
+
+import com.aelitis.azureus.core.metasearch.Engine;
+import com.aelitis.azureus.core.metasearch.Result;
+import com.aelitis.azureus.core.metasearch.ResultListener;
+import com.aelitis.azureus.core.subs.SubscriptionResult;
+
+public class
+RemSearchPluginSearch
+ implements ResultListener
+{
+ private RemSearchPluginPageGenerator generator;
+ private String request_headers;
+ private String originator;
+ private String expression;
+
+ private boolean json_output;
+
+ private String sid;
+ private long create_time;
+
+ private Map<String,engineResult> engine_results = new HashMap<String,engineResult>();
+
+ private boolean destroyed;
+
+ protected
+ RemSearchPluginSearch(
+ RemSearchPluginPageGenerator _generator,
+ String _request_headers,
+ String _originator,
+ String _expression,
+ boolean _json_output )
+ {
+ generator = _generator;
+ request_headers = _request_headers;
+ originator = _originator;
+ expression = _expression;
+
+ json_output = _json_output;
+
+ byte[] bytes = new byte[16];
+
+ RandomUtils.nextSecureBytes( bytes );
+
+ sid = Base32.encode( bytes );
+
+ create_time = SystemTime.getMonotonousTime();
+ }
+
+ public String
+ getRequestHeaders()
+ {
+ return( request_headers );
+ }
+
+ public String
+ getOriginator()
+ {
+ return( originator );
+ }
+
+ public String
+ getExpression()
+ {
+ return( expression );
+ }
+
+ public long
+ getAge()
+ {
+ return( SystemTime.getMonotonousTime() - create_time );
+ }
+
+ protected String
+ getSID()
+ {
+ return( sid );
+ }
+
+ protected void
+ setEngines(
+ RemSearchPluginEngine[] engines )
+ {
+ for (int i=0;i<engines.length;i++){
+
+ RemSearchPluginEngine engine = engines[i];
+
+ getResult( engine ).setEngine( engine );
+ }
+ }
+
+ protected void
+ handleResultReceiver(
+ String eid,
+ TrackerWebPageResponse request )
+
+ throws IOException
+ {
+ getResultByEID( eid ).setResultReceiver( request );
+ }
+
+ protected engineResult
+ getResult(
+ RemSearchPluginEngine engine )
+ {
+ synchronized( engine_results ){
+
+ engineResult result = engine_results.get( engine.getUID());
+
+ if ( result == null ){
+
+ result = new engineResult( engine );
+
+ engine_results.put( engine.getUID(), result );
+
+ if ( destroyed ){
+
+ result.destroy();
+ }
+ }
+
+ return( result );
+ }
+ }
+
+ protected engineResult
+ getResultByEID(
+ String eid )
+
+ throws IOException
+ {
+ synchronized( engine_results ){
+
+ engineResult result = engine_results.get( eid );
+
+ if ( result == null ){
+
+ throw( new IOException( "Engine '" + eid + "' not found" ));
+ }
+
+ return( result );
+ }
+ }
+
+ public void
+ contentReceived(
+ Engine engine,
+ String content )
+ {
+ // no interest
+ }
+
+ public void
+ matchFound(
+ Engine engine,
+ String[] fields )
+ {
+ // no interest
+ }
+
+ public void
+ engineFailed(
+ Engine engine,
+ Throwable e )
+ {
+ getResult( generator.getEngine( engine )).setFailed( e );
+ }
+
+ public void
+ engineRequiresLogin(
+ Engine engine,
+ Throwable e )
+ {
+ engineFailed( engine, e );
+ }
+
+ public void
+ resultsComplete(
+ Engine engine )
+ {
+ getResult( generator.getEngine( engine )).setComplete();
+ }
+
+ public void
+ resultsReceived(
+ Engine engine,
+ Result[] results)
+ {
+ ResultWrapper[] rw = new ResultWrapper[results.length];
+
+ for ( int i=0;i<results.length;i++ ){
+
+ rw[i] = new ResultWrapper( results[i] );
+ }
+
+ getResult( generator.getEngine( engine )).addResults( rw );
+ }
+
+ public void
+ resultsReceived(
+ Engine engine,
+ SubscriptionResult[] results)
+ {
+ ResultWrapper[] rw = new ResultWrapper[results.length];
+
+ for ( int i=0;i<results.length;i++ ){
+
+ rw[i] = new ResultWrapper( results[i] );
+ }
+
+ getResult( generator.getEngine( engine )).addResults( rw );
+ }
+
+ protected void
+ checkCompleteness()
+ {
+ List<engineResult> ok = new ArrayList<engineResult>();
+ List<engineResult> failed = new ArrayList<engineResult>();
+
+ synchronized( engine_results ){
+
+ for ( engineResult result: engine_results.values()){
+
+ if ( !result.isDone()){
+
+ return;
+ }
+
+ if ( result.succeeded()){
+
+ ok.add( result );
+
+ }else{
+
+ failed.add( result );
+ }
+ }
+ }
+
+ generator.complete( this, ok, failed );
+ }
+
+ public void
+ destroy()
+ {
+ List<engineResult> ok = new ArrayList<engineResult>();
+ List<engineResult> failed = new ArrayList<engineResult>();
+
+ synchronized( engine_results ){
+
+ destroyed = true;
+
+ for ( engineResult result: engine_results.values()){
+
+ result.destroy();
+
+ if ( result.succeeded()){
+
+ ok.add( result );
+
+ }else{
+
+ failed.add( result );
+ }
+ }
+ }
+
+ generator.complete( this, ok, failed );
+ }
+
+ public String
+ getString()
+ {
+ String e_str = "";
+
+ synchronized( engine_results ){
+
+ for ( Map.Entry<String,engineResult> entry: engine_results.entrySet()){
+
+ e_str += (e_str.length()==0?"":", ") + entry.getKey() + "=" + (entry.getValue().isDone()?"Y":"N");
+ }
+ }
+
+ return( getSID() + " - " + e_str );
+ }
+
+ private class
+ ResultWrapper
+ {
+ private Map map;
+
+ private
+ ResultWrapper(
+ Result result )
+ {
+ map = result.toJSONMap();
+ }
+
+ private
+ ResultWrapper(
+ SubscriptionResult result )
+ {
+ map = result.toJSONMap();
+ }
+
+ public Map
+ toJSONMap()
+ {
+ return( map );
+ }
+ }
+
+ protected class
+ engineResult
+ {
+ // TODO: timeout async receivers properly?
+
+ private RemSearchPluginEngine engine;
+ private TrackerWebPageResponse receiver;
+
+ private List<ResultWrapper> results = new ArrayList<ResultWrapper>();
+
+ private Throwable failure;
+ private boolean complete;
+
+ private boolean done;
+
+ private long mt_search_end = -1;
+
+ private AESemaphore wait_sem;
+
+ private boolean can_go_async = true;
+ private boolean went_async;
+
+ protected
+ engineResult(
+ RemSearchPluginEngine _engine )
+ {
+ engine = _engine;
+
+ if ( !generator.supportsAsync()){
+
+ wait_sem = new AESemaphore( "RSPS:waiter" );
+ }
+ }
+
+ protected void
+ setEngine(
+ RemSearchPluginEngine _engine )
+ {
+ synchronized( this ){
+
+ engine = _engine;
+ }
+
+ checkDone();
+ }
+
+ protected RemSearchPluginEngine
+ getEngine()
+ {
+ return( engine );
+ }
+
+ protected void
+ setResultReceiver(
+ TrackerWebPageResponse _receiver )
+
+ throws IOException
+ {
+ synchronized( this ){
+
+ if ( receiver != null ){
+
+ throw( new IOException( "Results for engine already returned" ));
+ }
+
+ receiver = _receiver;
+ }
+
+ if ( !checkDone()){
+
+ if ( wait_sem != null ){
+
+ if ( !wait_sem.reserve( 60*1000 )){
+
+ throw( new IOException( "timeout waiting for complete" ));
+ }
+ }else{
+
+ synchronized( engineResult.this ){
+
+ if ( can_go_async ){
+
+ went_async = true;
+
+ receiver.setAsynchronous( true );
+ }
+ }
+ }
+ }
+ }
+
+ protected void
+ addResults(
+ ResultWrapper[] _results )
+ {
+ if ( mt_search_end == -1 ){
+
+ mt_search_end = SystemTime.getMonotonousTime();
+ }
+
+ results.addAll( Arrays.asList( _results ));
+ }
+
+ protected long
+ getSearchElapsedTime()
+ {
+ if ( mt_search_end == -1 ){
+
+ return( -1 );
+ }
+
+ return( mt_search_end - create_time );
+ }
+
+ protected void
+ setFailed(
+ Throwable e )
+ {
+ synchronized( this ){
+
+ failure = e;
+ }
+
+ checkDone();
+ }
+
+ protected void
+ setComplete()
+ {
+ synchronized( this ){
+
+ complete = true;
+ }
+
+ checkDone();
+ }
+
+ protected void
+ destroy()
+ {
+ setFailed( new Throwable( "Search destroyed" ));
+ }
+
+ protected boolean
+ checkDone()
+ {
+ synchronized( this ){
+
+ if ( done ){
+
+ return( true );
+ }
+
+ if ( engine == null || receiver == null ){
+
+ return( false );
+ }
+
+ if ( complete || failure != null ){
+
+ done = true;
+
+ }else{
+
+ return( false );
+ }
+ }
+
+ try{
+ PrintWriter pw = new PrintWriter( new OutputStreamWriter( receiver.getOutputStream(), "UTF-8" ));
+
+ if ( complete ){
+
+ Map<String,Object> result_map = (Map<String,Object>)new JSONObject();
+
+ RemSearchPluginPageGenerator.getEngineDetails( engine, result_map );
+
+ result_map.put("sid", sid);
+
+ List<Map> result_list = new ArrayList<Map>(results.size());
+
+ for ( ResultWrapper result: results ){
+
+ result_list.add( result.toJSONMap());
+ }
+
+ result_map.put( "results", result_list );
+
+ Map<String,Object> complete_map = (Map<String,Object>)new JSONObject();
+
+ RemSearchPluginPageGenerator.getEngineDetails( engine, complete_map );
+
+ complete_map.put("sid", sid);
+
+ if ( json_output ){
+
+ result_map.putAll( complete_map );
+
+ pw.println( result_map.toString());
+
+ }else{
+
+ pw.println( "webSearch.loadResults( " + result_map.toString() + "); webSearch.engineCompleted(" + complete_map.toString() + ")" );
+ }
+ }else{
+
+ Map<String,Object> error_map = (Map<String,Object>)new JSONObject();
+
+ RemSearchPluginPageGenerator.getEngineDetails( engine, error_map );
+
+ error_map.put( "error", Debug.getNestedExceptionMessage( failure ));
+
+ error_map.put("sid", sid);
+
+ if ( json_output ){
+
+ pw.println( error_map.toString());
+
+ }else{
+
+ pw.println( "webSearch.engineFailed(" + error_map.toString() + ")" );
+ }
+ }
+
+ pw.flush();
+
+ }catch( Throwable e ){
+
+ Debug.printStackTrace( e );
+
+ }finally{
+
+ if ( wait_sem != null ){
+
+ wait_sem.releaseForever();
+
+ }else{
+
+ boolean async;
+
+ synchronized( engineResult.this ){
+
+ can_go_async = false;
+
+ async = went_async;
+ }
+
+ if ( async ){
+
+ try{
+ receiver.setAsynchronous( false );
+
+ }catch( Throwable e ){
+
+ Debug.printStackTrace( e );
+ }
+ }
+ }
+
+ checkCompleteness();
+ }
+
+ return( true );
+ }
+
+ protected boolean
+ isDone()
+ {
+ synchronized( this ){
+
+ return( done );
+ }
+ }
+
+ protected boolean
+ succeeded()
+ {
+ synchronized( this ){
+
+ return( complete );
+ }
+ }
+ }
+}
Added: plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginStats.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginStats.java (rev 0)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/RemSearchPluginStats.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -0,0 +1,54 @@
+/*
+ * Created on Nov 7, 2008
+ * Created by Paul Gardner
+ *
+ * Copyright 2008 Vuze, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+package com.aelitis.azureus.plugins.remsearch;
+
+public class
+RemSearchPluginStats
+{
+ private RemSearchPlugin plugin;
+
+ protected
+ RemSearchPluginStats(
+ RemSearchPlugin _plugin )
+ {
+ plugin = _plugin;
+ }
+
+ public long
+ getTotalSearches()
+ {
+ return( plugin.getTotalSearches());
+ }
+
+ public long
+ getTotalSearchesFailed()
+ {
+ return( plugin.getTotalSearchesFailed());
+ }
+
+ public long
+ getTotalEnginesFailed()
+ {
+ return( plugin.getTotalEnginesFailed());
+ }
+}
Added: plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/internat/Messages.properties
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/internat/Messages.properties (rev 0)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/internat/Messages.properties 2017-04-20 19:20:45 UTC (rev 44238)
@@ -0,0 +1,6 @@
+aeremsearch.name=Remote Search
+aeremsearch.config.http_port=HTTP Port [restart required]
+aeremsearch.config.search_timeout=Search timeout [millis]
+aeremsearch.config.max_searches=Max concurrent searches
+aeremsearch.config.max_results_per_engine=Max results per engine
+aeremsearch.config.url_prefix=URL prefix
\ No newline at end of file
Added: plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/test/Main.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/test/Main.java (rev 0)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/remsearch/test/Main.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -0,0 +1,167 @@
+/*
+ * Created on Nov 5, 2008
+ * Created by Paul Gardner
+ *
+ * Copyright 2008 Vuze, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+package com.aelitis.azureus.plugins.remsearch.test;
+
+import java.util.*;
+import java.io.*;
+import java.net.*;
+
+import org.gudy.azureus2.core3.util.AESemaphore;
+import org.gudy.azureus2.core3.util.FileUtil;
+import org.gudy.azureus2.plugins.utils.resourcedownloader.ResourceDownloaderFactory;
+import org.gudy.azureus2.pluginsimpl.local.utils.resourcedownloader.ResourceDownloaderFactoryImpl;
+
+import com.aelitis.azureus.util.JSONUtils;
+
+public class
+Main
+{
+ private static String[] terms =
+ {
+ "bunny", "trout",
+ };
+
+ protected void
+ search()
+ {
+ try{
+
+ final ResourceDownloaderFactory rdf = ResourceDownloaderFactoryImpl.getSingleton();
+
+ String term = terms[new Random().nextInt(terms.length)];
+
+ URL url = new URL( "http://www.vuze.com/psearch/search?q="; + term );
+
+ System.out.println( "Searching: " + url );
+
+ InputStream is = rdf.create( url ).download();
+
+ String str = FileUtil.readInputStreamAsString( is, 65*1024 );
+
+ int p1 = str.indexOf( '{' );
+ int p2 = str.lastIndexOf( '}' );
+
+ Map map = JSONUtils.decodeJSON( str.substring(p1,p2+1));
+
+ String sid = (String)map.get( "sid" );
+
+ List engines = (List)map.get( "engines" );
+
+ final AESemaphore sem = new AESemaphore( "x" );
+
+ for (int i=0;i<engines.size();i++){
+
+ Map engine = (Map)engines.get(i);
+
+ String eid = (String)engine.get( "id" );
+
+ final URL results = new URL( "http://www.vuze.com/psearch/get-results?sid="; + sid + "&eid=" + eid );
+
+ new Thread()
+ {
+ public void
+ run()
+ {
+ try{
+ InputStream is = rdf.create( results ).download();
+
+ String str = FileUtil.readInputStreamAsString( is, 65*1024 );
+
+ if ( str.startsWith( "webSearch.loadResults" )){
+
+ }else{
+
+ throw( new Exception( "Failed: " + str ));
+ }
+
+ }catch( Throwable e ){
+
+ e.printStackTrace();
+
+ }finally{
+
+ sem.release();
+ }
+ }
+
+ }.start();
+ }
+
+ for (int i=0;i<engines.size();i++){
+
+ sem.reserve();
+
+ System.out.println( "Got " + (i+1) + " of " + engines.size());
+ }
+ }catch( Throwable e ){
+
+ e.printStackTrace();
+ }
+ }
+
+ public static void
+ main(
+ String[] args )
+ {
+ final int conc = 10;
+ final int num_searches = 5;
+
+ final Main tester = new Main();
+
+ final AESemaphore sem = new AESemaphore( "y" );
+
+ long start = System.currentTimeMillis();
+
+ for (int i=0;i<conc;i++){
+
+ new Thread()
+ {
+ public void
+ run()
+ {
+ try{
+ for (int i=0;i<num_searches;i++){
+
+ tester.search();
+ }
+ }finally{
+
+ sem.release();
+ }
+ }
+ }.start();
+ }
+
+ for (int i=0;i<conc;i++){
+
+ sem.reserve();
+ }
+
+ long end = System.currentTimeMillis();
+
+ long elapsed = end-start;
+ long searches = conc*num_searches;
+
+ System.out.println( "Elapsed=" + elapsed + ",searches=" + searches + ": average=" + (elapsed/searches));
+ }
+}
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/SearchInstance.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/SearchInstance.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/SearchInstance.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -1,3 +1,18 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package com.aelitis.azureus.plugins.xmwebui;
import java.util.*;
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/TagSearchInstance.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/TagSearchInstance.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/TagSearchInstance.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -1,3 +1,18 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package com.aelitis.azureus.plugins.xmwebui;
import java.util.ArrayList;
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/TextualException.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/TextualException.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/TextualException.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -1,3 +1,18 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
package com.aelitis.azureus.plugins.xmwebui;
public class TextualException
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/TorrentBlank.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/TorrentBlank.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/TorrentBlank.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (C) Azureus Software, Inc, All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/XMWebUIPlugin.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/XMWebUIPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/XMWebUIPlugin.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,16 +6,17 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/XMRPCClientTest.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/XMRPCClientTest.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/XMRPCClientTest.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,19 +6,19 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
package com.aelitis.azureus.plugins.xmwebui.client;
import java.util.*;
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/connect/XMClientAccount.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/connect/XMClientAccount.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/connect/XMClientAccount.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,16 +6,17 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/connect/XMClientConnection.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/connect/XMClientConnection.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/connect/XMClientConnection.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,16 +6,17 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/connect/XMClientConnectionAdapter.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/connect/XMClientConnectionAdapter.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/connect/XMClientConnectionAdapter.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -3,19 +3,20 @@
* Created by Paul Gardner
*
* Copyright 2013 Azureus Software, Inc. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/proxy/XMClientProxy.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/proxy/XMClientProxy.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/proxy/XMClientProxy.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,16 +6,17 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClient.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClient.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClient.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,16 +6,17 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientCached.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientCached.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientCached.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,16 +6,17 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientDirect.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientDirect.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientDirect.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,19 +6,19 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
package com.aelitis.azureus.plugins.xmwebui.client.rpc;
import java.io.IOException;
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientException.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientException.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientException.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,19 +6,19 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
package com.aelitis.azureus.plugins.xmwebui.client.rpc;
@SuppressWarnings( "serial" )
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientFactory.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientFactory.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientFactory.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,19 +6,19 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
package com.aelitis.azureus.plugins.xmwebui.client.rpc;
import java.security.SecureRandom;
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientIndirect.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientIndirect.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientIndirect.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,16 +6,17 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientTunnel.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientTunnel.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientTunnel.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,19 +6,19 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
package com.aelitis.azureus.plugins.xmwebui.client.rpc;
import java.io.ByteArrayInputStream;
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientTunnelHandler.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientTunnelHandler.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientTunnelHandler.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,19 +6,19 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
package com.aelitis.azureus.plugins.xmwebui.client.rpc;
import java.util.Map;
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientUtils.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientUtils.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/client/rpc/XMRPCClientUtils.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,19 +6,19 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
package com.aelitis.azureus.plugins.xmwebui.client.rpc;
import java.io.ByteArrayOutputStream;
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/swt/XMWebUIPluginView.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/swt/XMWebUIPluginView.java 2017-04-20 18:07:48 UTC (rev 44237)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/swt/XMWebUIPluginView.java 2017-04-20 19:20:45 UTC (rev 44238)
@@ -6,16 +6,17 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License only.
- *
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details ( see the LICENSE file ).
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
|
|
From: <amogge@vu...> - 2017-04-20 18:23:26
|
Revision: 44237
Author: amogge
Date: 2017-04-20 18:07:48 +0000 (Thu, 20 Apr 2017)
Log Message:
-----------
better activityDate
Modified Paths:
--------------
plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/XMWebUIPlugin.java
Modified: plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/XMWebUIPlugin.java
===================================================================
--- plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/XMWebUIPlugin.java 2017-04-19 23:11:38 UTC (rev 44236)
+++ plugins/xmwebui/com/aelitis/azureus/plugins/xmwebui/XMWebUIPlugin.java 2017-04-20 18:07:48 UTC (rev 44237)
@@ -6613,9 +6613,25 @@
if (relative) {
return -l;
}
- // XXX THIS IS STUPID! Time on this machine won't be the same as the client..
+
return (SystemTime.getCurrentTime() / 1000) - l;
}
+
+ DownloadManagerState downloadState = download.getDownloadState();
+ long timestamp = downloadState.getLongParameter(DownloadManagerState.PARAM_DOWNLOAD_LAST_ACTIVE_TIME);
+ if (timestamp != 0) {
+ return timestamp / 1000;
+ }
+
+ timestamp = downloadState.getLongParameter(DownloadManagerState.PARAM_DOWNLOAD_COMPLETED_TIME);
+ if (timestamp != 0) {
+ return timestamp / 1000;
+ }
+
+ timestamp = downloadState.getLongParameter(DownloadManagerState.PARAM_DOWNLOAD_ADDED_TIME);
+ if (timestamp != 0) {
+ return timestamp / 1000;
+ }
return 0;
}
|
7 messages has been excluded from this view by a project administrator.
Oh no! Some styles failed to load.
Please try reloading this page