[jglobus-commit] CVS update: MODIFIED: proxy, DefaultGridProxyModel.java

Jaroslaw Gawor commit at globus.org
Fri Oct 13 15:22:07 CDT 2006


, DefaultProxyOptionsPanel.java, GridProxyModel.java, ProxyListener.java, ProxyOptionsWindow.java
 ...

  User: gawor   
  Date: 06/10/13 15:22:07

  Modified:    src/org/globus/tools/proxy Tag: globus_4_0_branch
                        DefaultGridProxyModel.java
                        DefaultProxyOptionsPanel.java GridProxyInit.java
                        GridProxyModel.java PKCS11ProxyOptionsPanel.java
                        ProxyListener.java ProxyOptionsPanel.java
                        ProxyOptionsWindow.java
  Log:
  resolves 1865 and 1895. formatting fixes
  
  Revision  Changes    Path
  No                   revision
  
  http://viewcvs.globus.org/viewcvs.cgi/jglobus/src/org/globus/tools/proxy/Tag:?cvsroot=Java+COG
  No                   revision
  
  http://viewcvs.globus.org/viewcvs.cgi/jglobus/src/org/globus/tools/proxy/globus_4_0_branch?cvsroot=Java+COG
  1.4.2.1   +30 -36    jglobus/src/org/globus/tools/proxy/DefaultGridProxyModel.java
  
  http://viewcvs.globus.org/viewcvs.cgi/jglobus/src/org/globus/tools/proxy/DefaultGridProxyModel.java?cvsroot=Java+COG&r1=1.4&r2=1.4.2.1
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DefaultGridProxyModel.java
  ===================================================================
  RCS file: /homes/dsl/cog/CVS/jglobus/src/org/globus/tools/proxy/DefaultGridProxyModel.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -b -r1.4 -r1.4.2.1
  --- DefaultGridProxyModel.java	18 Apr 2005 15:36:42 -0000	1.4
  +++ DefaultGridProxyModel.java	13 Oct 2006 20:22:07 -0000	1.4.2.1
  @@ -24,40 +24,34 @@
   
   public class DefaultGridProxyModel extends GridProxyModel {
       
  -    public GlobusCredential createProxy(String pwd)
  -	throws Exception {   
  +    public GlobusCredential createProxy(String pwd) throws Exception {
   
   	getProperties();
   
   	userCert = CertUtil.loadCertificate(props.getUserCertFile());
   	
  -	OpenSSLKey key = 
  -	    new BouncyCastleOpenSSLKey(props.getUserKeyFile());
  +        OpenSSLKey key = new BouncyCastleOpenSSLKey(props.getUserKeyFile());
   	
   	if (key.isEncrypted()) {
   	    try {
   		key.decrypt(pwd);
  -	    } catch(GeneralSecurityException e) {
  +            } catch (GeneralSecurityException e) {
   		throw new Exception("Wrong password or other security error");
   	    }
   	}
   	
   	PrivateKey userKey = key.getPrivateKey();
   	
  -	BouncyCastleCertProcessingFactory factory =
  -	    BouncyCastleCertProcessingFactory.getDefault();
  +        BouncyCastleCertProcessingFactory factory = BouncyCastleCertProcessingFactory
  +                .getDefault();
   
  -	int proxyType = (getLimited()) ? 
  -	    GSIConstants.DELEGATION_LIMITED :
  -	    GSIConstants.DELEGATION_FULL;
  -
  -	return factory.createCredential(new X509Certificate[] {userCert},
  -					userKey,
  -					props.getProxyStrength(), 
  -					props.getProxyLifeTime() * 3600,
  -					proxyType,
  -					(X509ExtensionSet)null);
  -    }
  +        int proxyType = (getLimited()) ? GSIConstants.DELEGATION_LIMITED
  +                : GSIConstants.DELEGATION_FULL;
       
  +        return factory.createCredential(new X509Certificate[] { userCert },
  +                userKey, props.getProxyStrength(),
  +                props.getProxyLifeTime() * 3600, proxyType,
  +                (X509ExtensionSet) null);
  +    }
       
   }
  
  
  
  1.3.2.1   +41 -44    jglobus/src/org/globus/tools/proxy/DefaultProxyOptionsPanel.java
  
  http://viewcvs.globus.org/viewcvs.cgi/jglobus/src/org/globus/tools/proxy/DefaultProxyOptionsPanel.java?cvsroot=Java+COG&r1=1.3&r2=1.3.2.1
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DefaultProxyOptionsPanel.java
  ===================================================================
  RCS file: /homes/dsl/cog/CVS/jglobus/src/org/globus/tools/proxy/DefaultProxyOptionsPanel.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -b -r1.3 -r1.3.2.1
  --- DefaultProxyOptionsPanel.java	18 Apr 2005 15:36:42 -0000	1.3
  +++ DefaultProxyOptionsPanel.java	13 Oct 2006 20:22:07 -0000	1.3.2.1
  @@ -27,11 +27,9 @@
   	gbc.weightx = 0;
   	setFill(GridBagConstraints.NONE);
   
  -	add(new JLabel("User Certificate: "),
  -	    0, 4, 1, 1);
  +        add(new JLabel("User Certificate: "), 0, 4, 1, 1);
   	
  -	add(new JLabel("User Private Key: "),
  -	    0, 5, 1, 1);
  +        add(new JLabel("User Private Key: "), 0, 5, 1, 1);
   	
   	setAnchor(GridBagConstraints.WEST);
   	
  @@ -42,17 +40,16 @@
   		
   	certFileFB = new FileBrowser("Select User Certificate", "Select"); 
   	
  -	add(certFileFB,
  -	    1, 4, 1, 1);
  +        add(certFileFB, 1, 4, 1, 1);
   	
   	keyFileFB = new FileBrowser("Select User Private Key", "Select");
   	
  -	add(keyFileFB,
  -	    1, 5, 1, 1);
  +        add(keyFileFB, 1, 5, 1, 1);
       }
   
       public boolean validateSettings() {
  -	if (!super.validateSettings()) return false;
  +        if (!super.validateSettings())
  +            return false;
   	
   	if (certFileFB.getFile().equals("")) {
   	    return error("Please enter the certificate file location");
  
  
  
  1.5.2.3   +307 -290  jglobus/src/org/globus/tools/proxy/GridProxyInit.java
  
  http://viewcvs.globus.org/viewcvs.cgi/jglobus/src/org/globus/tools/proxy/GridProxyInit.java?cvsroot=Java+COG&r1=1.5.2.2&r2=1.5.2.3
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: GridProxyInit.java
  ===================================================================
  RCS file: /homes/dsl/cog/CVS/jglobus/src/org/globus/tools/proxy/GridProxyInit.java,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -b -r1.5.2.2 -r1.5.2.3
  --- GridProxyInit.java	3 Aug 2006 03:18:02 -0000	1.5.2.2
  +++ GridProxyInit.java	13 Oct 2006 20:22:07 -0000	1.5.2.3
  @@ -37,23 +37,28 @@
   import org.globus.util.Util;
   import org.globus.tools.ui.util.UITools;
   
  -public class GridProxyInit extends JDialog
  -    implements ActionListener {
  +public class GridProxyInit extends JDialog implements ActionListener {
       
  -    private static final String PKCS11_MODEL = 
  -	"org.globus.tools.proxy.PKCS11GridProxyModel";
  +    private static final String PKCS11_MODEL = "org.globus.tools.proxy.PKCS11GridProxyModel";
   
       private final int MAX = 10;
       
       private JPasswordField passwordTF;
  +
       private JButton optionsButton, cancelButton, createButton;
  +
       private JCheckBox PKCS11Box = null;
  +
       private GridProxyModel model = null;
  +
       private ProxyListener proxyListener = null;
  +
       private GlobusCredential proxy = null;
   
       private boolean runAsApplication = false;
  +
       private boolean closeOnSuccess = false;
  +
       private boolean saveProxy = true;
       
       public GridProxyInit(Frame owner, boolean modal) {
  @@ -74,7 +79,7 @@
   	optionsButton.addActionListener(this);
   
   	passwordTF = new JPasswordField(15); 
  -	passwordTF.addActionListener( this );
  +        passwordTF.addActionListener(this);
   	
   	JPanel passPanel = new JPanel();
   	
  @@ -103,9 +108,9 @@
   	contentPane.setLayout(bl);
   	
   	/*
  -	contentPane.add(passPanel, BorderLayout.NORTH);
  -	contentPane.add(ibutPanel, BorderLayout.CENTER);
  -	contentPane.add(btPanel, BorderLayout.SOUTH);
  +         * contentPane.add(passPanel, BorderLayout.NORTH);
  +         * contentPane.add(ibutPanel, BorderLayout.CENTER);
  +         * contentPane.add(btPanel, BorderLayout.SOUTH);
   	*/
   
   	contentPane.add(passPanel);
  @@ -119,7 +124,7 @@
   	try {
   	    Class iClass = Class.forName(PKCS11_MODEL);
   	    PKCS11Box.setEnabled(true);
  -	} catch(Exception e) {
  +        } catch (Exception e) {
   	    PKCS11Box.setEnabled(false);
   	}
       }
  @@ -140,7 +145,8 @@
   	
   	if (source == createButton) {
   	    
  -	    if (!validateSettings()) return;
  +            if (!validateSettings())
  +                return;
   	    Thread th = (new Thread() {
   		    public void run() {
   			createButton.setEnabled(false);
  @@ -156,9 +162,7 @@
   	    
   	} else if (source == optionsButton) {
   	    model = getModel(PKCS11Box.isSelected());
  -	    ProxyOptionsWindow wind = 
  -		new ProxyOptionsWindow(this, 
  -				       true,
  +            ProxyOptionsWindow wind = new ProxyOptionsWindow(this, true,
   				       PKCS11Box.isSelected());
   	    wind.setProperties(model.getProperties());
   	    wind.pack();
  @@ -171,12 +175,10 @@
       }
       
       private boolean validateSettings() {
  -	char [] pwd = passwordTF.getPassword();
  +        char[] pwd = passwordTF.getPassword();
   	if (pwd.length == 0) {
  -	    JOptionPane.showMessageDialog(this, 
  -					  "Please enter your password.", 
  -					  "Need More Information", 
  -					  JOptionPane.WARNING_MESSAGE);
  +            JOptionPane.showMessageDialog(this, "Please enter your password.",
  +                    "Need More Information", JOptionPane.WARNING_MESSAGE);
   	    return false;
   	} 
   	return true;
  @@ -186,8 +188,8 @@
   	if (usePKCS11Device) {
   	    try {
   		Class iClass = Class.forName(PKCS11_MODEL);
  -		return (GridProxyModel)iClass.newInstance();
  -	    } catch(Exception e) {
  +                return (GridProxyModel) iClass.newInstance();
  +            } catch (Exception e) {
   		return new DefaultGridProxyModel();
   	    }
   	} else {
  @@ -197,8 +199,11 @@
       
       class Task extends Thread {
   	private boolean done = false;
  +
   	private Exception exception = null;
  +
   	private boolean cancel = false;
  +
   	private GlobusCredential proxy = null;
   
   	public boolean isDone() {
  @@ -223,13 +228,14 @@
   	    
   	    try {
   		proxy = model.createProxy(new String(passwordTF.getPassword()));
  -	    } catch(Exception e) {
  +            } catch (Exception e) {
   		exception = e;
   		done = true;
   		return;
   	    }
   	    
  -	    if (cancel) return;
  +            if (cancel)
  +                return;
   	    
   	    if (saveProxy) {
   		OutputStream out = null;
  @@ -239,16 +245,24 @@
   		    Util.setOwnerAccessOnly(proxyFile);
   		    out = new FileOutputStream(file);
   		    proxy.save(out);
  -		} catch(Exception e) {
  +                } catch (SecurityException e) {
  +                    exception = e;
  +                    done = true;
  +                    return;
  +                } catch (Exception e) {
   		    exception = e;
   		    done = true;
   		    return;
   		} finally {
   		    if (out != null) {
  -			try { out.close(); } catch(Exception e) {}
  +                        try {
  +                            out.close();
  +                        } catch (Exception e) {
   		    }
   		}
  -		if (cancel) return;
  +                }
  +                if (cancel)
  +                    return;
   	    }
   	    
   	    // send the event....
  @@ -271,15 +285,11 @@
   
   	progressBar.setValue(0);
   
  -	Object [] comp = {msgLabel, progressBar};
  -	Object [] options = { "Cancel" };
  +        Object[] comp = { msgLabel, progressBar };
  +        Object[] options = { "Cancel" };
   	
  -	JOptionPane pane = new JOptionPane(comp,
  -					   JOptionPane.DEFAULT_OPTION, 
  -					   JOptionPane.INFORMATION_MESSAGE,
  -					   null,
  -					   options,
  -					   options[0]);
  +        JOptionPane pane = new JOptionPane(comp, JOptionPane.DEFAULT_OPTION,
  +                JOptionPane.INFORMATION_MESSAGE, null, options, options[0]);
   	
   	final JDialog dialog = pane.createDialog(this, "Creating Proxy");
   
  @@ -290,7 +300,7 @@
   		    if (task.isDone()) {
   			dialog.setVisible(false);
   		    } else {
  -			progressBar.setValue( (progressBar.getValue()+1) % MAX );
  +                    progressBar.setValue((progressBar.getValue() + 1) % MAX);
   		    }
   		}
   	    });
  @@ -298,7 +308,10 @@
   	timer.start();
   	task.start();
   	
  -	try { Thread.sleep(500); } catch(Exception e) {}
  +        try {
  +            Thread.sleep(500);
  +        } catch (Exception e) {
  +        }
   
   	Object selectedValue = null;
   	
  @@ -321,16 +334,15 @@
   	    if (e == null) {
   		proxy = task.getProxy();
   		JOptionPane.showMessageDialog(this, 
  -					      "Proxy was successfully created.", 
  -					      "Proxy Created", 
  +                        "Proxy was successfully created.", "Proxy Created",
   					      JOptionPane.INFORMATION_MESSAGE);
   
  -		if (closeOnSuccess) setVisible(false);
  +                if (closeOnSuccess)
  +                    setVisible(false);
   	    } else {
   		proxy = null;
  -		JOptionPane.showMessageDialog(this, 
  -					      "Failed to create proxy: " + e.getMessage(),
  -					      "Proxy Create Error", 
  +                JOptionPane.showMessageDialog(this, "Failed to create proxy: "
  +                        + e.getMessage(), "Proxy Create Error",
   					      JOptionPane.ERROR_MESSAGE);
   	    }
   	} else {
  @@ -371,7 +383,12 @@
       // ---------------------------------
       
       public static void main(String args[]) {
  -	
  +        for (int i = 0; i < args.length; i++) {
  +            if (args[i].equals("-help")) {
  +                System.out.println("Syntax: java GridProxyInit");
  +                System.exit(0);
  +            }
  +        }
   	CertUtil.init();
   	
           GridProxyInit gpiFrame = new GridProxyInit(null, true);
  
  
  
  1.4.2.1   +11 -11    jglobus/src/org/globus/tools/proxy/GridProxyModel.java
  
  http://viewcvs.globus.org/viewcvs.cgi/jglobus/src/org/globus/tools/proxy/GridProxyModel.java?cvsroot=Java+COG&r1=1.4&r2=1.4.2.1
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: GridProxyModel.java
  ===================================================================
  RCS file: /homes/dsl/cog/CVS/jglobus/src/org/globus/tools/proxy/GridProxyModel.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -b -r1.4 -r1.4.2.1
  --- GridProxyModel.java	18 Apr 2005 15:36:43 -0000	1.4
  +++ GridProxyModel.java	13 Oct 2006 20:22:07 -0000	1.4.2.1
  @@ -18,10 +18,10 @@
   public abstract class GridProxyModel {
       
       protected X509Certificate userCert;
  +
       protected CoGProperties props = null;
       
  -    public abstract GlobusCredential createProxy(String pwd)
  -	throws Exception;
  +    public abstract GlobusCredential createProxy(String pwd) throws Exception;
       
       public CoGProperties getProperties() {
   	if (props == null) {
  
  
  
  1.3.2.1   +73 -76    jglobus/src/org/globus/tools/proxy/PKCS11ProxyOptionsPanel.java
  
  http://viewcvs.globus.org/viewcvs.cgi/jglobus/src/org/globus/tools/proxy/PKCS11ProxyOptionsPanel.java?cvsroot=Java+COG&r1=1.3&r2=1.3.2.1
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PKCS11ProxyOptionsPanel.java
  ===================================================================
  RCS file: /homes/dsl/cog/CVS/jglobus/src/org/globus/tools/proxy/PKCS11ProxyOptionsPanel.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -b -r1.3 -r1.3.2.1
  --- PKCS11ProxyOptionsPanel.java	18 Apr 2005 15:36:43 -0000	1.3
  +++ PKCS11ProxyOptionsPanel.java	13 Oct 2006 20:22:07 -0000	1.3.2.1
  @@ -29,11 +29,9 @@
   	gbc.weightx = 0;
   	setFill(GridBagConstraints.NONE);
   
  -	add(new JLabel("User Certificate Handle: "),
  -	    0, 4, 1, 1);
  +        add(new JLabel("User Certificate Handle: "), 0, 4, 1, 1);
   	
  -	add(new JLabel("User Private Handle: "),
  -	    0, 5, 1, 1);
  +        add(new JLabel("User Private Handle: "), 0, 5, 1, 1);
   	
   	setAnchor(GridBagConstraints.WEST);
   	
  @@ -44,20 +42,19 @@
   		
   	certHandleTF = new JTextField(20);
   	
  -	add(certHandleTF,
  -	    1, 4, 1, 1);
  +        add(certHandleTF, 1, 4, 1, 1);
   	
   	keyHandleTF = new JTextField(20);
   	
  -	add(keyHandleTF,
  -	    1, 5, 1, 1);
  +        add(keyHandleTF, 1, 5, 1, 1);
       }
       
       public boolean validateSettings() {
  -	if (!super.validateSettings()) return false;
  +        if (!super.validateSettings())
  +            return false;
   	
  -	if (certHandleTF.getText().equals("") &&
  -	    keyHandleTF.getText().equals("")) {
  +        if (certHandleTF.getText().equals("")
  +                && keyHandleTF.getText().equals("")) {
   	    return error("Please enter the certificate or the private key handle.");
   	} 
   	return true;
  
  
  
  1.3.2.1   +2 -2      jglobus/src/org/globus/tools/proxy/ProxyListener.java
  
  http://viewcvs.globus.org/viewcvs.cgi/jglobus/src/org/globus/tools/proxy/ProxyListener.java?cvsroot=Java+COG&r1=1.3&r2=1.3.2.1
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProxyListener.java
  ===================================================================
  RCS file: /homes/dsl/cog/CVS/jglobus/src/org/globus/tools/proxy/ProxyListener.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -b -r1.3 -r1.3.2.1
  
  
  
  1.4.2.1   +150 -123  jglobus/src/org/globus/tools/proxy/ProxyOptionsPanel.java
  
  http://viewcvs.globus.org/viewcvs.cgi/jglobus/src/org/globus/tools/proxy/ProxyOptionsPanel.java?cvsroot=Java+COG&r1=1.4&r2=1.4.2.1
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProxyOptionsPanel.java
  ===================================================================
  RCS file: /homes/dsl/cog/CVS/jglobus/src/org/globus/tools/proxy/ProxyOptionsPanel.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -b -r1.4 -r1.4.2.1
  --- ProxyOptionsPanel.java	18 Apr 2005 15:36:43 -0000	1.4
  +++ ProxyOptionsPanel.java	13 Oct 2006 20:22:07 -0000	1.4.2.1
  @@ -12,11 +12,15 @@
   
   import java.awt.FlowLayout;
   import java.awt.GridBagConstraints;
  +import java.awt.event.FocusEvent;
  +import java.awt.event.FocusListener;
  +
   import javax.swing.JOptionPane;
   import javax.swing.JLabel;
   import javax.swing.JPanel;
   import javax.swing.JRadioButton;
   import javax.swing.ButtonGroup;
  +import javax.swing.JTextField;
   
   import org.globus.common.CoGProperties;
   import org.globus.tools.ui.util.JJPanel;
  @@ -25,23 +29,26 @@
   public class ProxyOptionsPanel extends JJPanel {
   
       protected FileBrowser proxyFileFB;
  +
       protected ButtonGroup hoursGroup;
  +
       protected ButtonGroup bitsGroup;
  -    protected JRadioButton shRB, mhRB, lhRB, ghRB;
  +
  +    protected JRadioButton shRB, mhRB, lhRB, ghRB, otherRB;
  +
       protected JRadioButton sbRB, mbRB, lbRB, gbRB;
       
  +    private JTextField otherTF;
  +
       public ProxyOptionsPanel() {
   	
   	setAnchor(GridBagConstraints.EAST);
   	
  -	add(new JLabel("Proxy Lifetime: "),
  -	    0, 0, 1, 1);
  +        add(new JLabel("Proxy Lifetime: "), 0, 0, 1, 1);
   	
  -	add(new JLabel("Strength: "),
  -	    0, 1, 1, 1);
  +        add(new JLabel("Strength: "), 0, 1, 1, 1);
   	
  -	add(new JLabel("Proxy File: "),
  -	    0, 2, 1, 1);
  +        add(new JLabel("Proxy File: "), 0, 2, 1, 1);
   	
   	setAnchor(GridBagConstraints.WEST);
   	
  @@ -56,11 +63,13 @@
   	mhRB = new JRadioButton("24 h", true);
   	lhRB = new JRadioButton("1 week");
   	ghRB = new JRadioButton("1 month");
  +        otherRB = new JRadioButton();
   	
   	shRB.setActionCommand("12");
   	mhRB.setActionCommand("24");
   	lhRB.setActionCommand("168");
   	ghRB.setActionCommand("672");
  +        otherRB.setActionCommand("other");
   	
   	// Group the radio buttons.
   	hoursGroup = new ButtonGroup();
  @@ -68,14 +77,28 @@
   	hoursGroup.add(mhRB);
   	hoursGroup.add(lhRB);
   	hoursGroup.add(ghRB);
  +        hoursGroup.add(otherRB);
  +
  +        otherTF = new JTextField(3);
  +        otherTF.addFocusListener(new FocusListener() {
  +            public void focusGained(FocusEvent e) {
  +                otherRB.setSelected(true);
  +            }
  +
  +            public void focusLost(FocusEvent e) {
  +            }
  +
  +        });
   	
   	hoursPanel.add(shRB);
   	hoursPanel.add(mhRB);
   	hoursPanel.add(lhRB);
   	hoursPanel.add(ghRB);
  +        hoursPanel.add(otherRB);
  +        hoursPanel.add(otherTF);
  +        hoursPanel.add(new JLabel("h"));
   
  -	add(hoursPanel,
  -	    1, 0, 1, 1);
  +        add(hoursPanel, 1, 0, 1, 1);
   
   	JPanel bitsPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 2, 0));
   	
  @@ -100,19 +123,15 @@
   	bitsPanel.add(lbRB);
   	bitsPanel.add(gbRB);
   	
  -	add(bitsPanel,
  -	    1, 1, 1, 1);
  +        add(bitsPanel, 1, 1, 1, 1);
   	
   	proxyFileFB = new FileBrowser("Select Grid Proxy File", "Select");
   	
  -	add(proxyFileFB,
  -	    1, 2, 1, 1);
  +        add(proxyFileFB, 1, 2, 1, 1);
       }
   
       protected boolean error(String msg) {
  -	JOptionPane.showMessageDialog(this, 
  -				      msg,
  -				      "Need More Information", 
  +        JOptionPane.showMessageDialog(this, msg, "Need More Information",
   				      JOptionPane.WARNING_MESSAGE);
   	return false;
       }
  @@ -138,8 +157,10 @@
   	    lhRB.setSelected(true);
   	else if (value == 672)
   	    ghRB.setSelected(true);
  -	else 
  -	    shRB.setSelected(true);
  +        else {
  +            otherTF.setText(String.valueOf(value));
  +            otherRB.setSelected(true);
  +        }
   	
   	value = props.getProxyStrength();
   
  @@ -157,10 +178,16 @@
       }
       
       public void get(CoGProperties props) {
  -	props.setProxyLifeTime(Integer.parseInt(hoursGroup.getSelection().getActionCommand()));
  -	props.setProxyStrength(Integer.parseInt(bitsGroup.getSelection().getActionCommand()));
  -	
  +        props.setProxyStrength(Integer.parseInt(bitsGroup.getSelection()
  +                .getActionCommand()));
   	props.setProxyFile(proxyFileFB.getFile());
  +
  +        if (otherRB.isSelected()) {
  +            props.setProxyLifeTime(Integer.parseInt(otherTF.getText().trim()));
  +        } else {
  +            props.setProxyLifeTime(Integer.parseInt(hoursGroup.getSelection()
  +                    .getActionCommand()));
  +        }
       }
       
   }
  
  
  
  1.3.2.1   +48 -45    jglobus/src/org/globus/tools/proxy/ProxyOptionsWindow.java
  
  http://viewcvs.globus.org/viewcvs.cgi/jglobus/src/org/globus/tools/proxy/ProxyOptionsWindow.java?cvsroot=Java+COG&r1=1.3&r2=1.3.2.1
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProxyOptionsWindow.java
  ===================================================================
  RCS file: /homes/dsl/cog/CVS/jglobus/src/org/globus/tools/proxy/ProxyOptionsWindow.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -b -r1.3 -r1.3.2.1
  --- ProxyOptionsWindow.java	18 Apr 2005 15:36:43 -0000	1.3
  +++ ProxyOptionsWindow.java	13 Oct 2006 20:22:07 -0000	1.3.2.1
  @@ -22,13 +22,14 @@
   
   import org.globus.common.CoGProperties;
   
  -public class ProxyOptionsWindow extends JDialog 
  -    implements ActionListener {
  +public class ProxyOptionsWindow extends JDialog implements ActionListener {
       
       private ProxyOptionsPanel optionsPanel;
  +
       private CoGProperties properties;
       
       private JButton applyBt = null;
  +
       private JButton cancelBt = null;
   
       public ProxyOptionsWindow(Dialog owner, boolean modal, boolean pkcs11) {
  @@ -38,10 +39,12 @@
   	
   	if (pkcs11) {
   	    optionsPanel = new PKCS11ProxyOptionsPanel();
  -	    optionsPanel.setBorder(BorderFactory.createTitledBorder(" PKCS11 Options "));
  +            optionsPanel.setBorder(BorderFactory
  +                    .createTitledBorder(" PKCS11 Options "));
   	} else {
   	    optionsPanel = new DefaultProxyOptionsPanel();
  -	    optionsPanel.setBorder(BorderFactory.createTitledBorder(" Proxy Options "));
  +            optionsPanel.setBorder(BorderFactory
  +                    .createTitledBorder(" Proxy Options "));
   	}
   	
   	JPanel buttonPanel = new JPanel();
  
  
  




More information about the jglobus-commit mailing list