jsalvata 2004/01/08 13:43:48
Modified: src/core/org/apache/jmeter/gui Tag:
testbeans_experimental_branch
AbstractJMeterGuiComponent.java NamePanel.java
Log:
Fix errors that occured when I tried the new
GTK Look & Feel. Not that they are important, but
they may bite us in the future.
BTW, it turns out that "name" is a very bad name choice for
a property of an object that subclasses an AWT Component,
because Components already have such property...
Revision Changes Path
No revision
No revision
1.25.2.1 +5 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
Index: AbstractJMeterGuiComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -r1.25 -r1.25.2.1
--- AbstractJMeterGuiComponent.java 20 Oct 2003 23:57:24 -0000 1.25
+++ AbstractJMeterGuiComponent.java 8 Jan 2004 21:43:48 -0000 1.25.2.1
@@ -152,7 +152,10 @@
*/
public String getName()
{
- return getNamePanel().getName();
+ if (getNamePanel() != null) {
+ return getNamePanel().getName();
+ }
+ else return "";
}
/**
1.12.2.1 +3 -2 jakarta-jmeter/src/core/org/apache/jmeter/gui/NamePanel.java
Index: NamePanel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/NamePanel.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- NamePanel.java 19 Oct 2003 22:26:08 -0000 1.12
+++ NamePanel.java 8 Jan 2004 21:43:48 -0000 1.12.2.1
@@ -142,7 +142,8 @@
*/
public String getName()
{
- return nameField.getText();
+ if (nameField != null) return nameField.getText();
+ else return "";
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
