rpms/azureus/devel azureus-no-shared-plugins.patch, NONE, 1.1 azureus-no-shared-plugins2.patch, NONE, 1.1 azureus.spec, 1.9, 1.10

[Anthony Green (green)]

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20695

Modified Files:
	azureus.spec 
Added Files:
	azureus-no-shared-plugins.patch 
	azureus-no-shared-plugins2.patch 
Log Message:
Rev to -21.  Patches to remove ability to install "shared" plugins.


azureus-no-shared-plugins.patch:

--- NEW FILE azureus-no-shared-plugins.patch ---
--- org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java~	2005-11-22 14:28:02.000000000 -0500
+++ org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java	2006-01-27 23:12:16.000000000 -0500
@@ -237,21 +237,15 @@
   	}
   
 	public boolean 
-	isNextEnabled() 
+	isFinishEnabled() 
 	{
 		return(((InstallPluginWizard)wizard).getPluginList().size() > 0 );
 	}
 	
-	public boolean 
-	isFinishEnabled() 
-	{
-	   return false ;
+	public IWizardPanel getFinishPanel() {
+	    return new IPWFinishPanel(wizard,this);
 	}
 	
-  public IWizardPanel getNextPanel() {
-    return new IPWInstallModePanel(wizard,this);
-  }
-	
   public void updateList() {
     ArrayList list = new ArrayList();
     TableItem[] items = pluginList.getItems();
@@ -261,7 +255,7 @@
       }
     }
     ((InstallPluginWizard)wizard).setPluginList(list);
-    ((InstallPluginWizard)wizard).setNextEnabled( isNextEnabled() );
+    ((InstallPluginWizard)wizard).setFinishEnabled( isFinishEnabled() );
     
   }
 }

azureus-no-shared-plugins2.patch:

--- NEW FILE azureus-no-shared-plugins2.patch ---
--- org/gudy/azureus2/ui/swt/views/ConfigView.java~	2005-11-20 14:43:58.000000000 -0500
+++ org/gudy/azureus2/ui/swt/views/ConfigView.java	2006-01-28 13:17:26.000000000 -0500
@@ -539,37 +539,6 @@
       }
     });
 
-    label = new Label(infoGroup, SWT.WRAP);
-    label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    Messages.setLanguageText(label, "ConfigView.pluginlist.whereToPutOr");
-
-    label = new Label(infoGroup, SWT.WRAP);
-    gridData = new GridData(GridData.FILL_HORIZONTAL);
-    gridData.horizontalIndent = 10;
-    label.setLayoutData(gridData);
-    label.setText(sAppPluginDir);
-    label.setForeground(Colors.blue);
-    label.setCursor(Cursors.handCursor);
-    
- 
-    final String _sAppPluginDir = sAppPluginDir;
-    
-    //TODO : Fix it for windows
-    label.addMouseListener(new MouseAdapter() {
-      public void mouseUp(MouseEvent arg0) {
-        if(_sAppPluginDir.endsWith("/plugins/") || _sAppPluginDir.endsWith("\\plugins\\")) {
-          File f = new File(_sAppPluginDir);
-          if(f.exists() && f.isDirectory()) {
-            Program.launch(_sAppPluginDir);
-          } else {
-            String azureusDir = _sAppPluginDir.substring(0,_sAppPluginDir.length() - 9);
-            System.out.println(azureusDir);
-            Program.launch(azureusDir);
-          }
-        }
-      }
-    });
-    
     List pluginIFs = Arrays.asList( azureus_core.getPluginManager().getPlugins());
     
     Collections.sort( 
@@ -609,10 +578,6 @@
       
       	user_plugin = true;
       	
-      }else if (sDirName.length() > sAppPluginDir.length() && 
-            sDirName.substring(0, sAppPluginDir.length()).equals(sAppPluginDir)){
-      	
-      	sDirName = sDirName.substring(sAppPluginDir.length());
       }
       
       // Blank means it's internal


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- azureus.spec	27 Jan 2006 15:02:12 -0000	1.9
+++ azureus.spec	28 Jan 2006 21:35:57 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -30,6 +30,8 @@
 Patch10:        azureus-cache-size.patch
 Patch11:        azureus-remove-manifest-classpath.patch
 Patch12:        azureus-themed.patch
+Patch13:        azureus-no-shared-plugins.patch
+Patch14:        azureus-no-shared-plugins2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant, jpackage-utils >= 1.5, xml-commons-apis
@@ -63,6 +65,8 @@
 %patch10 -p0
 %patch11 -p0
 %patch12 -p0
+%patch13 -p0
+%patch14 -p0
 cp %{SOURCE4} License.txt
 cp %{SOURCE5} ChangeLog.txt
 
@@ -146,6 +150,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Fri Jan 27 2006 Anthony Green <green at redhat.com> - 2.3.0.6-21
+- Add azureus-no-shared-plugins.patch.
+- Add azureus-no-shared-plugins2.patch.
+
 * Fri Jan 27 2006 Anthony Green <green at redhat.com> - 2.3.0.6-20
 - Remove junit reference from startup script.