mstover1 2005/08/31 08:43:26
Modified: src/core/org/apache/jmeter/threads/gui ThreadGroupGui.java
src/core/org/apache/jmeter Splash.java JMeter.java
src/core/org/apache/jmeter/gui/util MenuFactory.java
Log:
Assertions should be addable to controllers and threadgroups
Revision Changes Path
1.30 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
Index: ThreadGroupGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ThreadGroupGui.java 12 Jul 2005 20:50:48 -0000 1.29
+++ ThreadGroupGui.java 31 Aug 2005 15:43:26 -0000 1.30
@@ -180,7 +180,7 @@
public JPopupMenu createPopupMenu() {
JPopupMenu pop = new JPopupMenu();
pop.add(MenuFactory.makeMenus(new String[] {
MenuFactory.CONTROLLERS, MenuFactory.LISTENERS,
- MenuFactory.SAMPLERS, MenuFactory.TIMERS,
MenuFactory.CONFIG_ELEMENTS, MenuFactory.PRE_PROCESSORS,
+ MenuFactory.SAMPLERS,
MenuFactory.ASSERTIONS,MenuFactory.TIMERS, MenuFactory.CONFIG_ELEMENTS,
MenuFactory.PRE_PROCESSORS,
MenuFactory.POST_PROCESSORS },
JMeterUtils.getResString("Add"), "Add"));
MenuFactory.addEditMenu(pop, true);
MenuFactory.addFileMenu(pop);
1.2 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/Splash.java
Index: Splash.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/Splash.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Splash.java 31 Aug 2005 14:16:33 -0000 1.1
+++ Splash.java 31 Aug 2005 15:43:26 -0000 1.2
@@ -73,8 +73,8 @@
g.drawImage(icon,0,0,icon.getWidth(null),icon.getHeight(null),null);
g.setColor(Color.BLACK);
g.setFont(font);
-
g.drawChars(versionNotice.toCharArray(),0,versionNotice.length(),10,115);
-
g.drawChars(copyRight.toCharArray(),0,copyRight.length(),10,120 +
(int)versionRect.getHeight());
+
g.drawChars(versionNotice.toCharArray(),0,versionNotice.length(),10,icon.getHeight(null)
+ 10);
+
g.drawChars(copyRight.toCharArray(),0,copyRight.length(),10,icon.getHeight(null)
+ 20 + (int)versionRect.getHeight());
}
public SplashCanvas(Font f)
1.43 +1 -1 jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
Index: JMeter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- JMeter.java 31 Aug 2005 14:16:33 -0000 1.42
+++ JMeter.java 31 Aug 2005 15:43:26 -0000 1.43
@@ -267,7 +267,7 @@
e.printStackTrace();
System.out.println("An error occurred: " +
e.getMessage());
System.exit(-1);
- }
+ }
}
/**
1.34 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Index: MenuFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- MenuFactory.java 12 Jul 2005 20:50:45 -0000 1.33
+++ MenuFactory.java 31 Aug 2005 15:43:26 -0000 1.34
@@ -81,7 +81,7 @@
// MENU_ADD_xxx - controls which items are in the ADD menu
// MENU_PARENT_xxx - controls which items are in the Insert Parent menu
private static final String[] MENU_ADD_CONTROLLER = new String[] {
MenuFactory.CONTROLLERS, MenuFactory.SAMPLERS,
- MenuFactory.CONFIG_ELEMENTS, MenuFactory.TIMERS,
MenuFactory.LISTENERS, MenuFactory.PRE_PROCESSORS,
+ MenuFactory.ASSERTIONS, MenuFactory.CONFIG_ELEMENTS,
MenuFactory.TIMERS, MenuFactory.LISTENERS, MenuFactory.PRE_PROCESSORS,
MenuFactory.POST_PROCESSORS };
private static final String[] MENU_PARENT_CONTROLLER = new String[] {
MenuFactory.CONTROLLERS };
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
