View | Details | Raw Unified | Return to bug 47946
Collapse All | Expand All

(-)src/core/org/apache/jmeter/resources/messages_fr.properties (+1 lines)
Lines 243-248 Link Here
243
graph_results_title=Graphique de r\u00E9sultats
243
graph_results_title=Graphique de r\u00E9sultats
244
grouping_add_separators=Ajouter des s\u00E9parateurs entre les groupes
244
grouping_add_separators=Ajouter des s\u00E9parateurs entre les groupes
245
grouping_in_controllers=Mettre chaque groupe dans un nouveau contr\u00F4leur
245
grouping_in_controllers=Mettre chaque groupe dans un nouveau contr\u00F4leur
246
grouping_in_transaction_controllers=Mettre chaque groupe dans un nouveau contr\u00F4leur de transaction
246
grouping_mode=Grouper \:
247
grouping_mode=Grouper \:
247
grouping_no_groups=Ne pas grouper les \u00E9chantillons
248
grouping_no_groups=Ne pas grouper les \u00E9chantillons
248
grouping_store_first_only=Stocker le 1er \u00E9chantillon pour chaque groupe uniquement
249
grouping_store_first_only=Stocker le 1er \u00E9chantillon pour chaque groupe uniquement
(-)src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (+1 lines)
Lines 621-626 Link Here
621
        m.addElement(JMeterUtils.getResString("grouping_add_separators")); // $NON-NLS-1$
621
        m.addElement(JMeterUtils.getResString("grouping_add_separators")); // $NON-NLS-1$
622
        m.addElement(JMeterUtils.getResString("grouping_in_controllers")); // $NON-NLS-1$
622
        m.addElement(JMeterUtils.getResString("grouping_in_controllers")); // $NON-NLS-1$
623
        m.addElement(JMeterUtils.getResString("grouping_store_first_only")); // $NON-NLS-1$
623
        m.addElement(JMeterUtils.getResString("grouping_store_first_only")); // $NON-NLS-1$
624
        m.addElement(JMeterUtils.getResString("grouping_in_transaction_controllers")); // $NON-NLS-1$
624
        groupingMode = new JComboBox(m);
625
        groupingMode = new JComboBox(m);
625
        groupingMode.setSelectedIndex(0);
626
        groupingMode.setSelectedIndex(0);
626
        groupingMode.addItemListener(this);
627
        groupingMode.addItemListener(this);
(-)src/core/org/apache/jmeter/resources/messages.properties (+1 lines)
Lines 280-285 Link Here
280
graph_results_title=Graph Results
280
graph_results_title=Graph Results
281
grouping_add_separators=Add separators between groups
281
grouping_add_separators=Add separators between groups
282
grouping_in_controllers=Put each group in a new controller
282
grouping_in_controllers=Put each group in a new controller
283
grouping_in_transaction_controllers=Put each group in a new transaction controller
283
grouping_mode=Grouping\:
284
grouping_mode=Grouping\:
284
grouping_no_groups=Do not group samplers
285
grouping_no_groups=Do not group samplers
285
grouping_store_first_only=Store 1st sampler of each group only
286
grouping_store_first_only=Store 1st sampler of each group only
(-)src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (-1 / +30 lines)
Lines 33-39 Link Here
33
import org.apache.jmeter.config.ConfigElement;
33
import org.apache.jmeter.config.ConfigElement;
34
import org.apache.jmeter.config.ConfigTestElement;
34
import org.apache.jmeter.config.ConfigTestElement;
35
import org.apache.jmeter.control.GenericController;
35
import org.apache.jmeter.control.GenericController;
36
import org.apache.jmeter.control.TransactionController;
36
import org.apache.jmeter.control.gui.LogicControllerGui;
37
import org.apache.jmeter.control.gui.LogicControllerGui;
38
import org.apache.jmeter.control.gui.TransactionControllerGui;
37
import org.apache.jmeter.engine.util.ValueReplacer;
39
import org.apache.jmeter.engine.util.ValueReplacer;
38
import org.apache.jmeter.exceptions.IllegalUserActionException;
40
import org.apache.jmeter.exceptions.IllegalUserActionException;
39
import org.apache.jmeter.functions.InvalidVariableException;
41
import org.apache.jmeter.functions.InvalidVariableException;
Lines 79-84 Link Here
79
81
80
    private static final String ASSERTION_GUI = AssertionGui.class.getName();
82
    private static final String ASSERTION_GUI = AssertionGui.class.getName();
81
83
84
    
85
    private static final String TRANSACTION_CONTROLLER_GUI = TransactionControllerGui.class.getName();
86
    
82
    private static final String LOGIC_CONTROLLER_GUI = LogicControllerGui.class.getName();
87
    private static final String LOGIC_CONTROLLER_GUI = LogicControllerGui.class.getName();
83
88
84
    private static final String HEADER_PANEL = HeaderPanel.class.getName();
89
    private static final String HEADER_PANEL = HeaderPanel.class.getName();
Lines 133-138 Link Here
133
138
134
    public static final int GROUPING_STORE_FIRST_ONLY = 3;
139
    public static final int GROUPING_STORE_FIRST_ONLY = 3;
135
140
141
    public static final int GROUPING_IN_TRANSACTION_CONTROLLERS = 4;
142
136
    // Must agree with the order of entries in the drop-down
143
    // Must agree with the order of entries in the drop-down
137
    // created in ProxyControlGui.createHTTPSamplerPanel()
144
    // created in ProxyControlGui.createHTTPSamplerPanel()
138
    public static final int SAMPLER_TYPE_HTTP_SAMPLER = 0;
145
    public static final int SAMPLER_TYPE_HTTP_SAMPLER = 0;
Lines 545-550 Link Here
545
    }
552
    }
546
553
547
    /**
554
    /**
555
     * Helper method to add a Simple Controller to contain the samplers.
556
     *
557
     * @param model
558
     *            Test component tree model
559
     * @param node
560
     *            Node in the tree where we will add the Controller
561
     * @param name
562
     *            A name for the Controller
563
     */
564
    private void addTransactionController(JMeterTreeModel model, JMeterTreeNode node, String name)
565
            throws IllegalUserActionException {
566
    	TransactionController sc = new TransactionController();
567
        sc.setProperty(TestElement.GUI_CLASS, TRANSACTION_CONTROLLER_GUI);
568
        sc.setName(name);
569
        model.addComponent(sc, node);
570
    }
571
    /**
548
     * Helpler method to replicate any timers found within the Proxy Controller
572
     * Helpler method to replicate any timers found within the Proxy Controller
549
     * into the provided sampler, while replacing any occurences of string _T_
573
     * into the provided sampler, while replacing any occurences of string _T_
550
     * in the timer's configuration with the provided deltaT.
574
     * in the timer's configuration with the provided deltaT.
Lines 734-739 Link Here
734
                if (groupingMode == GROUPING_IN_CONTROLLERS) {
758
                if (groupingMode == GROUPING_IN_CONTROLLERS) {
735
                    addSimpleController(treeModel, myTarget, sampler.getName());
759
                    addSimpleController(treeModel, myTarget, sampler.getName());
736
                }
760
                }
761
                if (groupingMode == GROUPING_IN_TRANSACTION_CONTROLLERS) {
762
                    addTransactionController(treeModel, myTarget, sampler.getName());
763
                }
737
                firstInBatch = true;// Remember this was first in its batch
764
                firstInBatch = true;// Remember this was first in its batch
738
            }
765
            }
739
            if (lastTime == 0) {
766
            if (lastTime == 0) {
Lines 752-758 Link Here
752
                sampler.setImageParser(true);
779
                sampler.setImageParser(true);
753
            }
780
            }
754
781
755
            if (groupingMode == GROUPING_IN_CONTROLLERS) {
782
            if (groupingMode == GROUPING_IN_CONTROLLERS || 
783
            		groupingMode == GROUPING_IN_TRANSACTION_CONTROLLERS) {
756
                // Find the last controller in the target to store the
784
                // Find the last controller in the target to store the
757
                // sampler there:
785
                // sampler there:
758
                for (int i = myTarget.getChildCount() - 1; i >= 0; i--) {
786
                for (int i = myTarget.getChildCount() - 1; i >= 0; i--) {
Lines 764-769 Link Here
764
                }
792
                }
765
            }
793
            }
766
794
795
            
767
            JMeterTreeNode newNode = treeModel.addComponent(sampler, myTarget);
796
            JMeterTreeNode newNode = treeModel.addComponent(sampler, myTarget);
768
797
769
            if (firstInBatch) {
798
            if (firstInBatch) {

Return to bug 47946