Re: svn commit: r1501989 - /jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java

[Milamber <mi...@apache.org>]

Le 10/07/2013 20:55, pmouawad@apache.org a ecrit :
> Author: pmouawad
> Date: Wed Jul 10 20:55:39 2013
> New Revision: 1501989
>
> URL: http://svn.apache.org/r1501989
> Log:
> Bug 55085 - UX Improvement : Ability to create New Test Plan from Templates
> Handle opening of browser on link clicking

Works for me too.
Great!

> Bugzilla Id: 55085
>
> Modified:
>      jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java?rev=1501989&r1=1501988&r2=1501989&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java Wed Jul 10 20:55:39 2013
> @@ -40,6 +40,8 @@ import javax.swing.JRootPane;
>   import javax.swing.JScrollPane;
>   import javax.swing.event.ChangeEvent;
>   import javax.swing.event.ChangeListener;
> +import javax.swing.event.HyperlinkEvent;
> +import javax.swing.event.HyperlinkListener;
>   
>   import org.apache.jmeter.gui.GuiPackage;
>   import org.apache.jmeter.gui.action.template.Template;
> @@ -48,12 +50,14 @@ import org.apache.jmeter.swing.HtmlPane;
>   import org.apache.jmeter.util.JMeterUtils;
>   import org.apache.jorphan.gui.ComponentUtil;
>   import org.apache.jorphan.gui.JLabeledChoice;
> +import org.apache.jorphan.logging.LoggingManager;
> +import org.apache.log.Logger;
>   
>   /**
>    * Dialog used for Templates selection
>    * @since 2.10
>    */
> -public class SelectTemplateDialog extends JDialog implements ChangeListener, ActionListener {
> +public class SelectTemplateDialog extends JDialog implements ChangeListener, ActionListener, HyperlinkListener {
>   
>       private static final long serialVersionUID = -4436834972710248247L;
>       
> @@ -61,7 +65,7 @@ public class SelectTemplateDialog extend
>       private static final int MINIMAL_BOX_WIDTH = 500;
>       private static final int MINIMAL_BOX_HEIGHT = 300;
>   
> -//    private static final Logger log = LoggingManager.getLoggerForClass();
> +    private static final Logger log = LoggingManager.getLoggerForClass();
>   
>       private final JLabeledChoice templateList = new JLabeledChoice(JMeterUtils.getResString("template_choose"), false); //$NON-NLS-1$;
>   
> @@ -157,6 +161,7 @@ public class SelectTemplateDialog extend
>           this.getContentPane().add(templateList, BorderLayout.NORTH);
>           helpDoc.setContentType("text/html"); //$NON-NLS-1$
>           helpDoc.setEditable(false);
> +        helpDoc.addHyperlinkListener(this);
>           this.getContentPane().add(scroller, BorderLayout.CENTER);
>   
>           JPanel buttonsPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
> @@ -211,4 +216,17 @@ public class SelectTemplateDialog extend
>                   : JMeterUtils.getResString("template_merge_from") );
>       }
>   
> +    @Override
> +    public void hyperlinkUpdate(HyperlinkEvent e) {
> +        if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
> +            if (java.awt.Desktop.isDesktopSupported()) {
> +                try {
> +                    java.awt.Desktop.getDesktop().browse(e.getURL().toURI());
> +                } catch (Exception ex) {
> +                    log.error("Error opening URL in browser:"+e.getURL());
> +                }
> +            }
> +        }
> +    }
> +
>   }
> \ No newline at end of file
>
>
>