Author: sebb
Date: Mon Nov 12 01:48:38 2007
New Revision: 594068
URL: http://svn.apache.org/viewvc?rev=594068&view=rev
Log:
Move MainFrame title setup to MainFrame class
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=594068&r1=594067&r2=594068&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Mon Nov 12
01:48:38 2007
@@ -50,6 +50,7 @@
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.exceptions.IllegalUserActionException;
import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jmeter.gui.MainFrame;
import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.action.ActionRouter;
import org.apache.jmeter.gui.action.Load;
@@ -213,11 +214,7 @@
treeLis.setActionHandler(ActionRouter.getInstance());
// NOTUSED: GuiPackage guiPack =
GuiPackage.getInstance(treeLis, treeModel);
- org.apache.jmeter.gui.MainFrame main = new
org.apache.jmeter.gui.MainFrame(ActionRouter.getInstance(),
- treeModel, treeLis);
- // TODO - set up these items in MainFrame?
- main.setTitle("Apache JMeter
("+JMeterUtils.getJMeterVersion()+")");// $NON-NLS-1$
-
main.setIconImage(JMeterUtils.getImage("jmeter.jpg").getImage());// $NON-NLS-1$
+ MainFrame main = new MainFrame(ActionRouter.getInstance(),
treeModel, treeLis);
ComponentUtil.centerComponentInWindow(main, 80);
main.show();
ActionRouter.getInstance().actionPerformed(new
ActionEvent(main, 1, ActionNames.ADD_ALL));
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java?rev=594068&r1=594067&r2=594068&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Mon Nov
12 01:48:38 2007
@@ -603,7 +603,7 @@
*/
public void setTestPlanFile(String f) {
testPlanFile = f;
-
getMainFrame().setTitle(JMeterUtils.getExtendedFrameTitle(testPlanFile));
+ getMainFrame().setExtendedFrameTitle(testPlanFile);
// Enable file revert action if a file is used
getMainFrame().setFileRevertEnabled(f != null);
getMainFrame().setProjectFileLoaded(f);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java?rev=594068&r1=594067&r2=594068&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Mon Nov
12 01:48:38 2007
@@ -74,7 +74,15 @@
*/
public class MainFrame extends JFrame implements TestListener, Remoteable {
- /** The menu bar. */
+ // This is used to keep track of local (non-remote) tests
+ // The name is chosen to be an unlikely host-name
+ private static final String LOCAL = "*local*"; // $NON-NLS-1$
+
+ // The default title for the Menu bar
+ private static final String DEFAULT_TITLE =
+ "Apache JMeter ("+JMeterUtils.getJMeterVersion()+")"; // $NON-NLS-1$
$NON-NLS-2$
+
+ /** The menu bar. */
private JMeterMenuBar menuBar;
/** The main panel where components display their GUIs. */
@@ -87,10 +95,10 @@
private JTree tree;
/** An image which is displayed when a test is running. */
- private ImageIcon runningIcon =
JMeterUtils.getImage("thread.enabled.gif");
+ private ImageIcon runningIcon =
JMeterUtils.getImage("thread.enabled.gif");// $NON-NLS-1$
/** An image which is displayed when a test is not currently running. */
- private ImageIcon stoppedIcon =
JMeterUtils.getImage("thread.disabled.gif");
+ private ImageIcon stoppedIcon =
JMeterUtils.getImage("thread.disabled.gif");// $NON-NLS-1$
/** The button used to display the running/stopped image. */
private JButton runningIndicator;
@@ -129,8 +137,8 @@
runningIndicator.setMargin(new Insets(0, 0, 0, 0));
runningIndicator.setBorder(BorderFactory.createEmptyBorder());
- totalThreads = new JLabel("0");
- activeThreads = new JLabel("0");
+ totalThreads = new JLabel("0"); // $NON-NLS-1$
+ activeThreads = new JLabel("0"); // $NON-NLS-1$
tree = makeTree(treeModel, treeListener);
@@ -144,9 +152,7 @@
* Default constructor for the JMeter frame. This constructor will not
* properly initialize the tree, so don't use it.
*/
- public MainFrame() {
- // TODO: Can we remove this constructor? JMeter won't behave
properly
- // if it used.
+ MainFrame() {
}
// MenuBar related methods
@@ -270,14 +276,14 @@
*/
public void showStoppingMessage(String host) {
stoppingMessage = new JDialog(this,
JMeterUtils.getResString("stopping_test_title"), true); //$NON-NLS-1$
- JLabel stopLabel = new
JLabel(JMeterUtils.getResString("stopping_test") + ": " + host); //$NON-NLS-1$
+ JLabel stopLabel = new
JLabel(JMeterUtils.getResString("stopping_test") + ": " + host);
//$NON-NLS-1$$NON-NLS-2$
stopLabel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20,
20));
stoppingMessage.getContentPane().add(stopLabel);
stoppingMessage.pack();
ComponentUtil.centerComponentInComponent(this, stoppingMessage);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
- if (stoppingMessage != null) {
+ if (stoppingMessage != null) {// TODO - how can
this be null?
stoppingMessage.show();
}
}
@@ -293,21 +299,10 @@
});
}
-
/***************************************************************************
- * !ToDo (Method description)
- *
- * @param comp
- * !ToDo (Parameter description)
-
**************************************************************************/
public void setMainPanel(JComponent comp) {
mainPanel.setViewportView(comp);
}
-
/***************************************************************************
- * !ToDoo (Method description)
- *
- * @return !ToDo (Return description)
-
**************************************************************************/
public JTree getTree() {
return tree;
}
@@ -320,7 +315,7 @@
* the running state.
*/
public void testStarted() {
- testStarted("local");
+ testStarted(LOCAL);
menuBar.setEnabled(true);
}
@@ -335,8 +330,8 @@
public void testStarted(String host) {
hosts.add(host);
runningIndicator.setIcon(runningIcon);
- activeThreads.setText("0");
- totalThreads.setText("0");
+ activeThreads.setText("0"); // $NON-NLS-1$
+ totalThreads.setText("0"); // $NON-NLS-1$
menuBar.setRunning(true, host);
}
@@ -346,7 +341,7 @@
* stopping message dialog.
*/
public void testEnded() {
- testEnded("local");
+ testEnded(LOCAL);
menuBar.setEnabled(false);
}
@@ -402,6 +397,22 @@
tree.setSelectionRow(1);
addWindowListener(new WindowHappenings());
+
+ setTitle(DEFAULT_TITLE);
+ setIconImage(JMeterUtils.getImage("jmeter.jpg").getImage());//
$NON-NLS-1$
+ }
+
+ public void setExtendedFrameTitle(String fname) {
+ // file New operation may set to null, so just return app name
+ if (fname == null) {
+ setTitle(DEFAULT_TITLE);
+ return;
+ }
+
+ // allow for windows / chars in filename
+ String temp = fname.replace('\\', '/'); // $NON-NLS-1$ //
$NON-NLS-2$
+ String simpleName = temp.substring(temp.lastIndexOf("/") +
1);// $NON-NLS-1$
+ setTitle(simpleName + " (" + fname + ") - " + DEFAULT_TITLE);
// $NON-NLS-1$ // $NON-NLS-2$
}
/**
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=594068&r1=594067&r2=594068&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Mon
Nov 12 01:48:38 2007
@@ -1047,28 +1047,6 @@
}
/**
- * Builds the string used as the main frame title
- *
- * @param fname
- * the fully qualified name of the current working file
- *
- * @return a string of the form "FileName (<full path>/FileName) -
Apache
- * JMeter". If fname is null, returns "Apache JMeter".
- */
- public static String getExtendedFrameTitle(String fname) {
- // file New operation may set to null, so just return
- // app name
- if (fname == null) {
- return "Apache JMeter"; // $NON-NLS-1$
- }
-
- // allow for windows / chars in filename
- String temp = fname.replace('\\', '/');
- String simpleName = temp.substring(temp.lastIndexOf("/") + 1);
- return simpleName + " (" + fname + ") - Apache JMeter"; //
$NON-NLS-1$ // $NON-NLS-2$ // $NON-NLS-3$
- }
-
- /**
* Determine whether we are in 'expert' mode. Certain features may be
hidden
* from user's view unless in expert mode.
*
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java?rev=594068&r1=594067&r2=594068&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java
(original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java Mon
Nov 12 01:48:38 2007
@@ -216,8 +216,6 @@
org.apache.jmeter.gui.ReportMainFrame main =
new
org.apache.jmeter.gui.ReportMainFrame(ReportActionRouter.getInstance(),
treeModel, treeLis);
- main.setTitle("Apache JMeter Report");
- main.setIconImage(JMeterUtils.getImage("jmeter.jpg").getImage());
ComponentUtil.centerComponentInWindow(main, 80);
main.show();
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java?rev=594068&r1=594067&r2=594068&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java
Mon Nov 12 01:48:38 2007
@@ -598,8 +598,7 @@
*/
public void setReportPlanFile(String f) {
reportPlanFile = f;
- ReportGuiPackage.getInstance().getMainFrame().setTitle(
-
JMeterUtils.getExtendedFrameTitle(reportPlanFile));
+
ReportGuiPackage.getInstance().getMainFrame().setExtendedFrameTitle(reportPlanFile);
try {
FileServer.getFileServer().setBasedir(reportPlanFile);
} catch (IOException e1) {
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java?rev=594068&r1=594067&r2=594068&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
(original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
Mon Nov 12 01:48:38 2007
@@ -70,6 +70,10 @@
private static final Logger log = LoggingManager.getLoggerForClass();
+ // The default title for the Menu bar
+ private static final String DEFAULT_TITLE =
+ "Apache JMeter ("+JMeterUtils.getJMeterVersion()+")"; // $NON-NLS-1$
$NON-NLS-2$
+
/** The menu bar. */
protected ReportMenuBar menuBar;
@@ -86,7 +90,7 @@
//private ImageIcon runningIcon =
JMeterUtils.getImage("thread.enabled.gif");
/** An image which is displayed when a test is not currently running. */
- private ImageIcon stoppedIcon =
JMeterUtils.getImage("thread.disabled.gif");
+ private ImageIcon stoppedIcon =
JMeterUtils.getImage("thread.disabled.gif");// $NON-NLS-1$
/** The x coordinate of the last location where a component was dragged. */
private int previousDragXLocation = 0;
@@ -230,8 +234,8 @@
* the host where JMeter threads are stopping
*/
public void showStoppingMessage(String host) {
- stoppingMessage = new JDialog(this,
JMeterUtils.getResString("stopping_test_title"), true);
- JLabel stopLabel = new
JLabel(JMeterUtils.getResString("stopping_test") + ": " + host);
+ stoppingMessage = new JDialog(this,
JMeterUtils.getResString("stopping_test_title"), true);// $NON-NLS-1$
+ JLabel stopLabel = new
JLabel(JMeterUtils.getResString("stopping_test") + ": " + host);// $NON-NLS-1$
stopLabel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
stoppingMessage.getContentPane().add(stopLabel);
stoppingMessage.pack();
@@ -249,11 +253,6 @@
mainPanel.setViewportView(comp);
}
-
/***************************************************************************
- * !ToDoo (Method description)
- *
- * @return !ToDo (Return description)
-
**************************************************************************/
public JTree getTree() {
return this.tree;
}
@@ -331,9 +330,25 @@
tree.setSelectionRow(1);
addWindowListener(new WindowHappenings());
+
+ setTitle(DEFAULT_TITLE);
+ setIconImage(JMeterUtils.getImage("jmeter.jpg").getImage());//
$NON-NLS-1$
}
- /**
+ public void setExtendedFrameTitle(String fname) {
+ // file New operation may set to null, so just return app name
+ if (fname == null) {
+ setTitle(DEFAULT_TITLE);
+ return;
+ }
+
+ // allow for windows / chars in filename
+ String temp = fname.replace('\\', '/'); // $NON-NLS-1$ //
$NON-NLS-2$
+ String simpleName = temp.substring(temp.lastIndexOf("/") +
1);// $NON-NLS-1$
+ setTitle(simpleName + " (" + fname + ") - " + DEFAULT_TITLE);
// $NON-NLS-1$ // $NON-NLS-2$
+ }
+
+ /**
* Create the JMeter tool bar pane containing the running indicator.
*
* @return a panel containing the running indicator
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
