You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by or...@apache.org on 2003/01/27 21:02:31 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/gui/panel TabbedMainPanel.java
oros 2003/01/27 12:02:30
Modified: src/core/org/apache/jmeter/gui/document Tag:
refactorings_branch JMeterDocument.java
JMeterDocumentManager.java
src/core/org/apache/jmeter/gui/panel Tag:
refactorings_branch TabbedMainPanel.java
Log:
replace single new document when opening an existing document
Revision Changes Path
No revision
No revision
1.1.2.3 +15 -1 jakarta-jmeter/src/core/org/apache/jmeter/gui/document/Attic/JMeterDocument.java
Index: JMeterDocument.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/document/Attic/JMeterDocument.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- JMeterDocument.java 26 Jan 2003 22:22:01 -0000 1.1.2.2
+++ JMeterDocument.java 27 Jan 2003 20:02:30 -0000 1.1.2.3
@@ -90,6 +90,15 @@
}
+ public boolean isNew() {
+ return getFile() == null;
+ }
+
+ public boolean hasChanged() {
+ // todo: implement
+ return false;
+ }
+
public File getFile()
{
return file;
@@ -144,5 +153,10 @@
} else {
return getFile().getAbsolutePath();
}
+ }
+
+ public String getName()
+ {
+ return name;
}
}
1.1.2.3 +22 -3 jakarta-jmeter/src/core/org/apache/jmeter/gui/document/Attic/JMeterDocumentManager.java
Index: JMeterDocumentManager.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/document/Attic/JMeterDocumentManager.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- JMeterDocumentManager.java 26 Jan 2003 22:22:01 -0000 1.1.2.2
+++ JMeterDocumentManager.java 27 Jan 2003 20:02:30 -0000 1.1.2.3
@@ -59,10 +59,21 @@
public JMeterDocument loadDocument(File file) throws IOException
{
FileInputStream in = new FileInputStream(file);
+ JMeterDocument singleDocument = null;
+ if (documents.size() == 1)
+ {
+ singleDocument = (JMeterDocument)documents.values().iterator().next();
+ }
// todo: should never happen but what if the element is not a NamedTestElement?
NamedTestElement element = (NamedTestElement)SaveService.loadSubTree(in);
- return createDocument(file, element);
+ JMeterDocument document = createDocument(file, element);
+
+ if (singleDocument != null && singleDocument.isNew() && !singleDocument.hasChanged())
+ {
+ closeDocument(singleDocument);
+ }
+ return document;
}
private JMeterDocument createDocument(File file, NamedTestElement element)
@@ -83,6 +94,13 @@
return createDocument(null, testplan);
}
+
+ public void closeDocument(JMeterDocument document)
+ {
+ documents.remove(document.getName());
+ notifyListeners(document, true);
+ }
+
/**
* Register a listener.
*/
@@ -155,7 +173,8 @@
public NamedTestElement getCurrentTestElement()
{
- if(getCurrentDocument() == null) {
+ if (getCurrentDocument() == null)
+ {
return null;
}
No revision
No revision
1.1.2.2 +14 -1 jakarta-jmeter/src/core/org/apache/jmeter/gui/panel/Attic/TabbedMainPanel.java
Index: TabbedMainPanel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/panel/Attic/TabbedMainPanel.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TabbedMainPanel.java 21 Jan 2003 23:42:59 -0000 1.1.2.1
+++ TabbedMainPanel.java 27 Jan 2003 20:02:30 -0000 1.1.2.2
@@ -55,6 +55,9 @@
package org.apache.jmeter.gui.panel;
+import java.util.*;
+import java.awt.*;
+
import javax.swing.*;
import javax.swing.event.*;
@@ -72,6 +75,9 @@
public class TabbedMainPanel extends JTabbedPane implements JMeterDocumentManagerListener, ChangeListener
{
+ private Map documentPanels = new HashMap();
+
+
public TabbedMainPanel()
{
JMeterDocumentManager.getInstance().addListener(this);
@@ -87,6 +93,12 @@
public void documentRemoved(JMeterDocument document)
{
+ Component documentComponent = (Component)documentPanels.get(document.getName());
+
+ if (documentComponent != null) {
+ remove(documentComponent);
+ documentPanels.remove(document.getName());
+ }
}
private void addDocument(org.apache.jmeter.gui.document.JMeterDocument document)
@@ -105,6 +117,7 @@
addTab(document.getFileName(), icon, panel, document.getAbsolutePath());
setSelectedComponent(panel);
+ documentPanels.put(document.getName(), panel);
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>