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

(-)apache-jmeter-2.13/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (+17 lines)
Lines 47-53 Link Here
47
import org.apache.commons.lang3.time.DateUtils;
47
import org.apache.commons.lang3.time.DateUtils;
48
import org.apache.http.conn.ssl.AbstractVerifier;
48
import org.apache.http.conn.ssl.AbstractVerifier;
49
import org.apache.jmeter.assertions.ResponseAssertion;
49
import org.apache.jmeter.assertions.ResponseAssertion;
50
import org.apache.jmeter.assertions.SizeAssertion;
50
import org.apache.jmeter.assertions.gui.AssertionGui;
51
import org.apache.jmeter.assertions.gui.AssertionGui;
52
import org.apache.jmeter.assertions.gui.SizeAssertionGui;
51
import org.apache.jmeter.config.Arguments;
53
import org.apache.jmeter.config.Arguments;
52
import org.apache.jmeter.config.ConfigElement;
54
import org.apache.jmeter.config.ConfigElement;
53
import org.apache.jmeter.config.ConfigTestElement;
55
import org.apache.jmeter.config.ConfigTestElement;
Lines 72-77 Link Here
72
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
74
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
73
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
75
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
74
import org.apache.jmeter.protocol.http.util.HTTPConstants;
76
import org.apache.jmeter.protocol.http.util.HTTPConstants;
77
import org.apache.jmeter.reporters.ResultSaver;
78
import org.apache.jmeter.reporters.gui.ResultSaverGui;
75
import org.apache.jmeter.samplers.SampleEvent;
79
import org.apache.jmeter.samplers.SampleEvent;
76
import org.apache.jmeter.samplers.SampleListener;
80
import org.apache.jmeter.samplers.SampleListener;
77
import org.apache.jmeter.samplers.SampleResult;
81
import org.apache.jmeter.samplers.SampleResult;
Lines 1162-1168 Link Here
1162
                                final TestElement headerManager = subConfigs[i];
1166
                                final TestElement headerManager = subConfigs[i];
1163
                                headerManager.setProperty(TestElement.GUI_CLASS, HEADER_PANEL);
1167
                                headerManager.setProperty(TestElement.GUI_CLASS, HEADER_PANEL);
1164
                                treeModel.addComponent(headerManager, newNode);
1168
                                treeModel.addComponent(headerManager, newNode);
1169
                            }else  if (subConfigs[i] instanceof ResponseAssertion) {
1170
                                final TestElement res = subConfigs[i];
1171
                                res.setProperty(TestElement.GUI_CLASS, ASSERTION_GUI);
1172
                                treeModel.addComponent(res, newNode);
1173
                            }else  if (subConfigs[i] instanceof ResultSaver) {
1174
                                final TestElement res = subConfigs[i];
1175
                                res.setProperty(TestElement.GUI_CLASS, ResultSaverGui.class.getName());
1176
                                treeModel.addComponent(res, newNode);
1177
                            }else  if (subConfigs[i] instanceof SizeAssertion) {
1178
                                final TestElement res = subConfigs[i];
1179
                                res.setProperty(TestElement.GUI_CLASS, SizeAssertionGui.class.getName());
1180
                                treeModel.addComponent(res, newNode);
1165
                            }
1181
                            }
1182
1166
                        }
1183
                        }
1167
                    } catch (IllegalUserActionException e) {
1184
                    } catch (IllegalUserActionException e) {
1168
                        JMeterUtils.reportErrorToUser(e.getMessage());
1185
                        JMeterUtils.reportErrorToUser(e.getMessage());

Return to bug 58888