Menu
▾
▴
[Cogkit-svn] SF.net SVN: cogkit:[2080] trunk/current/src/cog/modules/transfer-gui/src/ org/globus/transfer/reliable/client
|
From: <li...@us...> - 2008-07-22 05:28:14
|
Revision: 2080
http://cogkit.svn.sourceforge.net/cogkit/?rev=2080&view=rev
Author: liuwt
Date: 2008-07-22 05:28:11 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/BaseRFTClient.java
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/GridFTPGUIView.java
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTButtonActionListener.java
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTClient.java
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTOptions.java
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTOptionsPanel.java
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTPanel.java
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferFileParser.java
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParam.java
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParamPanel.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/BaseRFTClient.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/BaseRFTClient.java 2008-07-22 05:27:57 UTC (rev 2079)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/BaseRFTClient.java 2008-07-22 05:28:11 UTC (rev 2080)
@@ -289,7 +289,10 @@
ClientSecurityDescriptor desc = getClientSecDesc();
// Credential to sign with, assuming default credential
GlobusCredential credential = GlobusCredential.getDefaultCredential();
-
+ //desc.setGSITransport(Constants.GSI_TRANSPORT);
+ //desc.setAuthz(AuthUtil.getClientAuthorization("self"));
+
+
String factoryUrl = PROTOCOL + "://" + host + ":"
+ port + SERVICE_URL_ROOT
+ DelegationConstants.FACTORY_PATH;
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/GridFTPGUIView.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/GridFTPGUIView.java 2008-07-22 05:27:57 UTC (rev 2079)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/GridFTPGUIView.java 2008-07-22 05:28:11 UTC (rev 2080)
@@ -44,9 +44,11 @@
import org.globus.tools.proxy.GridProxyInit;
import org.globus.tools.ui.util.CustomFileFilter;
import org.globus.tools.ui.util.UITools;
-import org.globus.transfer.reliable.client.myproxy.MyProxyLogonGUI;
+import org.globus.transfer.reliable.client.credential.CredentialDialog;
+import org.globus.transfer.reliable.client.credential.myproxy.MyProxyLogonGUI;
import org.globus.transfer.reliable.client.utils.LogFileUtils;
import org.globus.transfer.reliable.client.utils.UIConstants;
+import org.globus.transfer.reliable.client.utils.Utils;
import org.globus.util.ConfigUtil;
import org.globus.util.Util;
@@ -139,10 +141,11 @@
mainPanel = new javax.swing.JPanel();
jToolBar1 = new javax.swing.JToolBar();
+ credential_button = new javax.swing.JButton();
jButton1 = new javax.swing.JButton();
- jButton2 = new javax.swing.JButton();
+ gridftp_button = new javax.swing.JButton();
jButton4 = new javax.swing.JButton();
- jButton3 = new javax.swing.JButton();
+ local_button = new javax.swing.JButton();
jButton5 = new javax.swing.JButton();
jButton7 = new javax.swing.JButton();
jButton8 = new javax.swing.JButton();
@@ -179,6 +182,22 @@
jToolBar1.setName("jToolBar1"); // NOI18N
org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(org.globus.transfer.reliable.client.GridFTPGUIApp.class).getContext().getResourceMap(GridFTPGUIView.class);
+
+ credential_button.setIcon(resourceMap.getIcon("jButton1.icon")); // NOI18N
+ credential_button.setText(resourceMap.getString("credential_button.text")); // NOI18N
+ credential_button.setToolTipText(resourceMap.getString("credential_button.toolTipText")); // NOI18N
+ credential_button.setFocusable(false);
+ credential_button.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ credential_button.setName("credential_button"); // NOI18N
+ credential_button.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+ credential_button.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ credential_buttonActionPerformed(evt);
+ }
+ });
+ jToolBar1.add(credential_button);
+
+
jButton1.setIcon(resourceMap.getIcon("jButton1.icon")); // NOI18N
jButton1.setText(resourceMap.getString("jButton1.text")); // NOI18N
jButton1.setToolTipText(resourceMap.getString("jButton1.toolTipText")); // NOI18N
@@ -191,21 +210,21 @@
jButton1ActionPerformed(evt);
}
});
- jToolBar1.add(jButton1);
+ //jToolBar1.add(jButton1);
- jButton2.setIcon(resourceMap.getIcon("jButton2.icon")); // NOI18N
- jButton2.setText(resourceMap.getString("jButton2.text")); // NOI18N
- jButton2.setToolTipText(resourceMap.getString("jButton2.toolTipText")); // NOI18N
- jButton2.setFocusable(false);
- jButton2.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
- jButton2.setName("jButton2"); // NOI18N
- jButton2.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- jButton2.addActionListener(new java.awt.event.ActionListener() {
+ gridftp_button.setIcon(resourceMap.getIcon("gridftp_button.icon")); // NOI18N
+ gridftp_button.setText(resourceMap.getString("gridftp_button.text")); // NOI18N
+ gridftp_button.setToolTipText(resourceMap.getString("gridftp_button.toolTipText")); // NOI18N
+ gridftp_button.setFocusable(false);
+ gridftp_button.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ gridftp_button.setName("gridftp_button"); // NOI18N
+ gridftp_button.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+ gridftp_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- jButton2ActionPerformed(evt);
+ gridftp_buttonActionPerformed(evt);
}
});
- jToolBar1.add(jButton2);
+ jToolBar1.add(gridftp_button);
jButton4.setIcon(resourceMap.getIcon("jButton4.icon")); // NOI18N
jButton4.setText(resourceMap.getString("jButton4.text")); // NOI18N
@@ -220,18 +239,18 @@
});
//jToolBar1.add(jButton4);
- jButton3.setIcon(resourceMap.getIcon("jButton3.icon")); // NOI18N
- jButton3.setText(resourceMap.getString("jButton3.text")); // NOI18N
- jButton3.setFocusable(false);
- jButton3.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
- jButton3.setName("jButton3"); // NOI18N
- jButton3.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- jButton3.addActionListener(new java.awt.event.ActionListener() {
+ local_button.setIcon(resourceMap.getIcon("local_button.icon")); // NOI18N
+ local_button.setText(resourceMap.getString("local_button.text")); // NOI18N
+ local_button.setFocusable(false);
+ local_button.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ local_button.setName("local_button"); // NOI18N
+ local_button.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+ local_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- jButton3ActionPerformed(evt);
+ local_buttonActionPerformed(evt);
}
});
- jToolBar1.add(jButton3);
+ jToolBar1.add(local_button);
jButton5.setIcon(resourceMap.getIcon("jButton5.icon")); // NOI18N
jButton5.setText(resourceMap.getString("jButton5.text")); // NOI18N
@@ -257,7 +276,7 @@
jButton7ActionPerformed(evt);
}
});
- jToolBar1.add(jButton7);
+ //jToolBar1.add(jButton7);
jButton8.setIcon(resourceMap.getIcon("jButton8.icon")); // NOI18N
jButton8.setText(resourceMap.getString("jButton8.text")); // NOI18N
@@ -346,32 +365,32 @@
});
jMenu1.add(jMenuItem1);
- jMenuItem8.setText(resourceMap.getString("jMenuItem8.text")); // NOI18N
- jMenuItem8.setName("jMenuItem8"); // NOI18N
- jMenuItem8.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- jMenuItem8ActionPerformed(evt);
- }
- });
- jMenu1.add(jMenuItem8);
+// jMenuItem8.setText(resourceMap.getString("jMenuItem8.text")); // NOI18N
+// jMenuItem8.setName("jMenuItem8"); // NOI18N
+// jMenuItem8.addActionListener(new java.awt.event.ActionListener() {
+// public void actionPerformed(java.awt.event.ActionEvent evt) {
+// jMenuItem8ActionPerformed(evt);
+// }
+// });
+// jMenu1.add(jMenuItem8);
- jMenuItem9.setText(resourceMap.getString("jMenuItem9.text")); // NOI18N
- jMenuItem9.setName("jMenuItem9"); // NOI18N
- jMenuItem9.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- jMenuItem9ActionPerformed(evt);
- }
- });
- jMenu1.add(jMenuItem9);
-
- jMenuItem10.setText(resourceMap.getString("jMenuItem10.text")); // NOI18N
- jMenuItem10.setName("jMenuItem10"); // NOI18N
- jMenuItem10.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- jMenuItem10ActionPerformed(evt);
- }
- });
- jMenu1.add(jMenuItem10);
+// jMenuItem9.setText(resourceMap.getString("jMenuItem9.text")); // NOI18N
+// jMenuItem9.setName("jMenuItem9"); // NOI18N
+// jMenuItem9.addActionListener(new java.awt.event.ActionListener() {
+// public void actionPerformed(java.awt.event.ActionEvent evt) {
+// jMenuItem9ActionPerformed(evt);
+// }
+// });
+// jMenu1.add(jMenuItem9);
+//
+// jMenuItem10.setText(resourceMap.getString("jMenuItem10.text")); // NOI18N
+// jMenuItem10.setName("jMenuItem10"); // NOI18N
+// jMenuItem10.addActionListener(new java.awt.event.ActionListener() {
+// public void actionPerformed(java.awt.event.ActionEvent evt) {
+// jMenuItem10ActionPerformed(evt);
+// }
+// });
+// jMenu1.add(jMenuItem10);
jMenuItem2.setText(resourceMap.getString("jMenuItem2.text")); // NOI18N
jMenuItem2.setName("jMenuItem2"); // NOI18N
@@ -494,9 +513,15 @@
setStatusBar(statusPanel);
}// </editor-fold>//GEN-END:initComponents
- private void jMenuItem2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem2ActionPerformed
- System.out.println("aaaaaaa");
- fileTransferMainPanel1.createNewLocalFrame();
+ protected void credential_buttonActionPerformed(ActionEvent evt) {
+ CredentialDialog d = new CredentialDialog(null, false);
+ d.setLocation(100, 100);
+ d.setVisible(true);
+
+ }
+
+ private void jMenuItem2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem2ActionPerformed
+ localFrameHandle();
}//GEN-LAST:event_jMenuItem2ActionPerformed
private void jMenu1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenu1ActionPerformed
@@ -616,8 +641,18 @@
}
}//GEN-LAST:event_jMenuItem7ActionPerformed
- private void jButton3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton3ActionPerformed
- fileTransferMainPanel1.createNewLocalFrame();
+ private void localFrameHandle() {
+ boolean isRFTEnabled = (new Boolean((String)Utils.getProperty("rft_enabled", "rft.properties"))).booleanValue();
+ if (isRFTEnabled) {
+ JOptionPane.showMessageDialog(null, "RFT is enabled, you can not use local dialog",
+ "Message", JOptionPane.ERROR_MESSAGE);
+ } else {
+ fileTransferMainPanel1.createNewLocalFrame();
+ }
+ }
+ private void local_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton3ActionPerformed
+ localFrameHandle();
+
}//GEN-LAST:event_jButton3ActionPerformed
private void jButton5ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton3ActionPerformed
@@ -649,7 +684,7 @@
}//GEN-LAST:event_jButton3ActionPerformed
- private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
+ private void gridftp_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
fileTransferMainPanel1.createRemoteFrame(1, null, 2811);
}//GEN-LAST:event_jButton2ActionPerformed
@@ -667,10 +702,13 @@
}//GEN-LAST:event_jMenuItem9ActionPerformed
private void jMenuItem10ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem9ActionPerformed
- JFrame frame = new JFrame("RFT GUI Client");
+ JFrame frame = new JFrame("Advanced Options");
RFTPanel rftPanel = new RFTPanel();
+ rftPanel.setFrame(frame);
frame.getContentPane().add(rftPanel);
- frame.pack();
+ frame.setSize(500, 500);
+ frame.setLocation(100, 100);
+ //frame.pack();
frame.setVisible(true);
}//GEN-LAST:event_jMenuItem9ActionPerformed
@@ -896,13 +934,14 @@
private FileTransferMainPanel fileTransferMainPanel1 = new FileTransferMainPanel();
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jButton1;
- private javax.swing.JButton jButton2;
- private javax.swing.JButton jButton3;
+ private javax.swing.JButton gridftp_button;
+ private javax.swing.JButton local_button;
private javax.swing.JButton jButton4;
private javax.swing.JButton jButton5;
private javax.swing.JButton jButton6;
private javax.swing.JButton jButton7;
private javax.swing.JButton jButton8;
+ private javax.swing.JButton credential_button;
private javax.swing.JDesktopPane jDesktopPane1;
private javax.swing.JMenu jMenu1;
private javax.swing.JMenu jMenu2;
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTButtonActionListener.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTButtonActionListener.java 2008-07-22 05:27:57 UTC (rev 2079)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTButtonActionListener.java 2008-07-22 05:28:11 UTC (rev 2080)
@@ -15,8 +15,7 @@
public class RFTButtonActionListener {
private QueuePanel queuePanel = null;
private RFTClient rftClient = null;
- private RFTPanel panel = null;
- private static int transferID = 1;
+ private RFTPanel panel = null;
public RFTButtonActionListener(RFTPanel panel) {
this.panel = panel;
@@ -35,9 +34,8 @@
RFTTransferParam param = job.getParam();
TransferType transfer = param.getTransfers1()[0];
- String[] cols = {Integer.toString(job.getJobID()), Integer.toString(transferID++),
- Integer.toString(1), transfer.getSourceUrl(), transfer.getDestinationUrl(),
- "started", "0", "No errors"};
+ String[] cols = {Integer.toString(job.getJobID()), transfer.getSourceUrl(),
+ transfer.getDestinationUrl(), "started", "0", "No errors"};
queuePanel.addTransfer(cols);
rftClient.startTransfer(job);
}
@@ -48,12 +46,12 @@
*/
public void stopButtonAction(String jobID) throws Exception {
- int selectedRowIndex = queuePanel.getRowIndex(jobID, 1);
+ int selectedRowIndex = queuePanel.getRowIndex(jobID, 0);
String id = queuePanel.getColumnValue(selectedRowIndex, 0);
rftClient.stopTransfer(id);
- queuePanel.setColumnValue(selectedRowIndex, 5, "Cancelled");
- queuePanel.setColumnValue(selectedRowIndex, 6, "0");
- queuePanel.setColumnValue(selectedRowIndex, 7, "No errors");
+ queuePanel.setColumnValue(selectedRowIndex, 3, "Cancelled");
+ queuePanel.setColumnValue(selectedRowIndex, 4, "0");
+ queuePanel.setColumnValue(selectedRowIndex, 5, "No errors");
}
public void loadFileButtonAction(RFTJob job, QueuePanel queuePanel) throws Exception {
@@ -61,8 +59,8 @@
TransferType[] transfers = param.getTransfers1();
for (int i = 0; i < transfers.length; i++) {
- String[] cols = {Integer.toString(job.getJobID()), Integer.toString(transferID++),
- Integer.toString(i+1), transfers[i].getSourceUrl(),
+ String[] cols = {Integer.toString(job.getJobID()),
+ transfers[i].getSourceUrl(),
transfers[i].getDestinationUrl(), "started", "0", "No errors"};
queuePanel.addTransfer(cols);
}
@@ -81,8 +79,8 @@
* @param Pending
* @param cancelled
*/
- public void updateOverallStatus(int finished, int active, int failed,
- int retrying, int pending, int cancelled) {
- panel.updateOverallStatus(finished, active, failed, retrying, pending, cancelled);
- }
+// public void updateOverallStatus(int finished, int active, int failed,
+// int retrying, int pending, int cancelled) {
+// panel.updateOverallStatus(finished, active, failed, retrying, pending, cancelled);
+// }
}
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTClient.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTClient.java 2008-07-22 05:27:57 UTC (rev 2079)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTClient.java 2008-07-22 05:28:11 UTC (rev 2080)
@@ -6,6 +6,7 @@
package org.globus.transfer.reliable.client;
+import java.io.FileWriter;
import java.rmi.RemoteException;
import java.util.Calendar;
import java.util.HashMap;
@@ -42,6 +43,7 @@
import org.globus.wsrf.WSNConstants;
import org.globus.wsrf.container.ServiceContainer;
import org.globus.wsrf.core.notification.ResourcePropertyValueChangeNotificationElementType;
+import org.globus.wsrf.encoding.ObjectSerializer;
import org.globus.wsrf.impl.security.authorization.Authorization;
import org.globus.wsrf.impl.security.authorization.HostAuthorization;
import org.globus.wsrf.impl.security.authorization.ResourcePDPConfig;
@@ -69,6 +71,11 @@
private QueuePanel queuePanel = null;
private RFTButtonActionListener listener = null;
private TransferStatusReporter reporter = null;
+
+ public RFTClient() {
+ super();
+ }
+
public RFTClient(RFTButtonActionListener listener, QueuePanel queuePanel) {
super();
this.listener = listener;
@@ -77,6 +84,7 @@
new TransferStatusReporter().start();
}
+
/**
* Generate RFT transfer request
* @param options RFT options
@@ -88,10 +96,10 @@
//set RFT options
RFTOptionsType rftOptions = new RFTOptionsType();
- rftOptions.setBinary(options.isBinary());
- rftOptions.setBlockSize(options.getBlockSize());
- rftOptions.setDcau(options.isDcau());
- rftOptions.setNotpt(options.isNotpt());
+// rftOptions.setBinary(options.isBinary());
+// rftOptions.setBlockSize(options.getBlockSize());
+// rftOptions.setDcau(options.isDcau());
+// rftOptions.setNotpt(options.isNotpt());
rftOptions.setParallelStreams(options.getParallelStream());
rftOptions.setTcpBufferSize(options.getTcpBufferSize());
@@ -107,9 +115,9 @@
TransferRequestType request = new TransferRequestType();
request.setRftOptions(rftOptions);
request.setTransfer(rftParam.getTransfers1());
- request.setAllOrNone(options.isAllOrNone());
+ //request.setAllOrNone(options.isAllOrNone());
request.setConcurrency(options.getConcurrent());
- request.setMaxAttempts(options.getMaxAttampts());
+ //request.setMaxAttempts(options.getMaxAttampts());
request.setTransferCredentialEndpoint(epr);
return request;
@@ -130,8 +138,8 @@
throw new IllegalArgumentException(UIConstants.ILLEGAL_HOST);
}
String port = rftParam.getServerPort();
- String authType = rftParam.getAuthType();
- String authzType = rftParam.getAuthzType();
+// String authType = rftParam.getAuthType();
+// String authzType = rftParam.getAuthzType();
if (null == port) {
if (authType.equals(GSIConstants.GSI_TRANSPORT)) {
port = "8443";
@@ -152,12 +160,26 @@
EndpointReferenceType credEPR = delegateCredential(host, port);
TransferRequestType transferType = getTransferRequestType(options, rftParam, credEPR);
EndpointReferenceType rftepr = createRFT(rftFactoryAddress, transferType);
+
rftepr.setAddress(new Address(rftServiceAddress));
ReliableFileTransferPortType rft = rftLocator
.getReliableFileTransferPortTypePort(rftepr);
- setAuthzValue(authzType);
+ //setAuthzValue(authzType);
setSecurity((Stub)rft);
+ //write epr to a file
+ QName qname = new QName("http://www.globus.org/namespaces/2004/10/rft", "TransferKey");
+ String resourceKey = rftepr.getProperties().get(qname).getValue();
+ FileWriter writer = new FileWriter(resourceKey);
+ try {
+ QName qName1 = new QName("", "RFT_EPR");
+ writer.write(ObjectSerializer.toString(rftepr, qName1));
+ } finally {
+ if(null != writer) {
+ writer.close();
+ }
+ }
+
//For secure notifications
epr2ID.put(createMapKey(rftepr), Integer.toString(jobID));
ID2Stub.put(Integer.toString(jobID), rft);
@@ -272,25 +294,25 @@
.getDescription(0).get_value());
}
} else if (RFTConstants.OVERALL_STATUS_RESOURCE.equals(topicQName)) {
- OverallStatus overallStatus = (OverallStatus) changeMessage
- .getNewValue().get_any()[0].getValueAsType(
- RFTConstants.OVERALL_STATUS_RESOURCE,
- OverallStatus.class);
- int finished = overallStatus.getTransfersFinished();
- int active = overallStatus.getTransfersActive();
- int failed = overallStatus.getTransfersFailed();
- int retrying = overallStatus.getTransfersRestarted();
- int pending = overallStatus.getTransfersPending();
- int cancelled = overallStatus.getTransfersCancelled();
- System.out.println("\n Overall status of transfer:");
- System.out.println("Finished/Active/Failed/Retrying/Pending/Cancelled");
- System.out.print(overallStatus.getTransfersFinished() + "/");
- System.out.print(overallStatus.getTransfersActive() + "/");
- System.out.print(overallStatus.getTransfersFailed() + "/");
- System.out.print(overallStatus.getTransfersRestarted() + "/");
- System.out.print(overallStatus.getTransfersPending() + "/");
- System.out.print(overallStatus.getTransfersCancelled());
- listener.updateOverallStatus(finished, active, failed, retrying, pending, cancelled);
+// OverallStatus overallStatus = (OverallStatus) changeMessage
+// .getNewValue().get_any()[0].getValueAsType(
+// RFTConstants.OVERALL_STATUS_RESOURCE,
+// OverallStatus.class);
+// int finished = overallStatus.getTransfersFinished();
+// int active = overallStatus.getTransfersActive();
+// int failed = overallStatus.getTransfersFailed();
+// int retrying = overallStatus.getTransfersRestarted();
+// int pending = overallStatus.getTransfersPending();
+// int cancelled = overallStatus.getTransfersCancelled();
+// System.out.println("\n Overall status of transfer:");
+// System.out.println("Finished/Active/Failed/Retrying/Pending/Cancelled");
+// System.out.print(overallStatus.getTransfersFinished() + "/");
+// System.out.print(overallStatus.getTransfersActive() + "/");
+// System.out.print(overallStatus.getTransfersFailed() + "/");
+// System.out.print(overallStatus.getTransfersRestarted() + "/");
+// System.out.print(overallStatus.getTransfersPending() + "/");
+// System.out.print(overallStatus.getTransfersCancelled());
+ //listener.updateOverallStatus(finished, active, failed, retrying, pending, cancelled);
}
@@ -337,36 +359,55 @@
//int length = queuePanel.tableSize();
int i = 0;
while (i < queuePanel.tableSize()) {
- int jobID = Integer.parseInt(queuePanel.getColumnValue(i, 0));
- int j = 1;
- while (j + i < queuePanel.tableSize()) {
- int nextJobID = Integer.parseInt(queuePanel.getColumnValue(j + i, 0));
- if (jobID == nextJobID) {
- //System.out.println("jobid=" + jobID + ", nextjobid=" + nextJobID + ", j=" + j);
- j++;
- } else {
- break;
- }
- }
-
- ReliableFileTransferPortType rft = (ReliableFileTransferPortType)ID2Stub.get(Integer.toString(jobID));
- if (null != rft) {
- try {
- GetStatusSetResponse response = rft.getStatusSet(new GetStatusSet(1, j));
- for (int k = 0; k < j; k++) {
- TransferStatusType statusType = response.getTransferStatusSet(k);
- String status = statusType.getStatus().getValue();
- if (i + k < queuePanel.tableSize()) {
- queuePanel.setColumnValue(i + k, 5, status);
- }
- }
+ String isRFT = queuePanel.getColumnValue(i, 7);
+ String status = queuePanel.getColumnValue(i, 3);
+ if ("true".equals(isRFT) &&
+ !("Finished".equals(status)) && !"Expanding_Done".equals(status)) {
+ int jobID = Integer.parseInt(queuePanel.getColumnValue(i, 0));
+ ReliableFileTransferPortType rft = (ReliableFileTransferPortType)ID2Stub.get(Integer.toString(jobID));
+ if (null != rft) {
+ try {
+ GetStatusSetResponse response = rft.getStatusSet(new GetStatusSet(1, 1));
+ TransferStatusType statusType = response.getTransferStatusSet(0);
+ String jobStatus = statusType.getStatus().getValue();
+ queuePanel.setColumnValue(i , 3, jobStatus);
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
-
- i+=j;
+ }
}
+ i++;
+// int jobID = Integer.parseInt(queuePanel.getColumnValue(i, 0));
+// int j = 1;
+// while (j + i < queuePanel.tableSize()) {
+// int nextJobID = Integer.parseInt(queuePanel.getColumnValue(j + i, 0));
+// if (jobID == nextJobID) {
+// //System.out.println("jobid=" + jobID + ", nextjobid=" + nextJobID + ", j=" + j);
+// j++;
+// } else {
+// break;
+// }
+// }
+//
+// ReliableFileTransferPortType rft = (ReliableFileTransferPortType)ID2Stub.get(Integer.toString(jobID));
+// if (null != rft) {
+// try {
+// GetStatusSetResponse response = rft.getStatusSet(new GetStatusSet(1, j));
+// for (int k = 0; k < j; k++) {
+// TransferStatusType statusType = response.getTransferStatusSet(k);
+// String status = statusType.getStatus().getValue();
+// if (i + k < queuePanel.tableSize()) {
+// queuePanel.setColumnValue(i + k, 3, status);
+// }
+// }
+// } catch (Exception e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+//
+// i+=j;
+// }
}
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTOptions.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTOptions.java 2008-07-22 05:27:57 UTC (rev 2079)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTOptions.java 2008-07-22 05:28:11 UTC (rev 2080)
@@ -1,15 +1,15 @@
package org.globus.transfer.reliable.client;
public class RFTOptions {
- private int blockSize;
+ //private int blockSize;
private int concurrent;
private int parallelStream;
private int tcpBufferSize;
- private int maxAttampts;
- private boolean dcau;
- private boolean notpt;
- private boolean binary;
- private boolean allOrNone;
+ //private int maxAttampts;
+ //private boolean dcau;
+ //private boolean notpt;
+ //private boolean binary;
+ //private boolean allOrNone;
private String destDN;
private String sourceDN;
@@ -18,31 +18,30 @@
}
- public RFTOptions(int blockSize, int concurrent, int parallelStream,
- int tcpBufferSize, int maxAttampts, boolean dcau, boolean notpt,
- boolean binary, boolean allOrNone, String destDN, String sourceDN) {
+ public RFTOptions(int concurrent, int parallelStream,
+ int tcpBufferSize, String destDN, String sourceDN) {
super();
- this.blockSize = blockSize;
+ //this.blockSize = blockSize;
this.concurrent = concurrent;
this.parallelStream = parallelStream;
this.tcpBufferSize = tcpBufferSize;
- this.maxAttampts = maxAttampts;
- this.dcau = dcau;
- this.notpt = notpt;
- this.binary = binary;
- this.allOrNone = allOrNone;
+// this.maxAttampts = maxAttampts;
+// this.dcau = dcau;
+// this.notpt = notpt;
+// this.binary = binary;
+// this.allOrNone = allOrNone;
this.destDN = destDN;
this.sourceDN = sourceDN;
}
- public int getBlockSize() {
- return blockSize;
- }
+// public int getBlockSize() {
+// return blockSize;
+// }
+//
+// public void setBlockSize(int blockSize) {
+// this.blockSize = blockSize;
+// }
- public void setBlockSize(int blockSize) {
- this.blockSize = blockSize;
- }
-
public int getConcurrent() {
return concurrent;
}
@@ -67,46 +66,46 @@
this.tcpBufferSize = tcpBufferSize;
}
- public int getMaxAttampts() {
- return maxAttampts;
- }
+// public int getMaxAttampts() {
+// return maxAttampts;
+// }
+//
+// public void setMaxAttampts(int maxAttampts) {
+// this.maxAttampts = maxAttampts;
+// }
- public void setMaxAttampts(int maxAttampts) {
- this.maxAttampts = maxAttampts;
- }
+// public boolean isDcau() {
+// return dcau;
+// }
+//
+// public void setDcau(boolean dcau) {
+// this.dcau = dcau;
+// }
+//
+// public boolean isNotpt() {
+// return notpt;
+// }
+//
+// public void setNotpt(boolean notpt) {
+// this.notpt = notpt;
+// }
+//
+// public boolean isBinary() {
+// return binary;
+// }
+//
+// public void setBinary(boolean binary) {
+// this.binary = binary;
+// }
+//
+// public boolean isAllOrNone() {
+// return allOrNone;
+// }
+//
+// public void setAllOrNone(boolean allOrNone) {
+// this.allOrNone = allOrNone;
+// }
- public boolean isDcau() {
- return dcau;
- }
-
- public void setDcau(boolean dcau) {
- this.dcau = dcau;
- }
-
- public boolean isNotpt() {
- return notpt;
- }
-
- public void setNotpt(boolean notpt) {
- this.notpt = notpt;
- }
-
- public boolean isBinary() {
- return binary;
- }
-
- public void setBinary(boolean binary) {
- this.binary = binary;
- }
-
- public boolean isAllOrNone() {
- return allOrNone;
- }
-
- public void setAllOrNone(boolean allOrNone) {
- this.allOrNone = allOrNone;
- }
-
public String getDestDN() {
return destDN;
}
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTOptionsPanel.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTOptionsPanel.java 2008-07-22 05:27:57 UTC (rev 2079)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTOptionsPanel.java 2008-07-22 05:28:11 UTC (rev 2080)
@@ -1,21 +1,13 @@
-/*
- * RFTOptions.java
- *
- * Created on 2008年2月17日, 下午6:30
- */
-
package org.globus.transfer.reliable.client;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import javax.swing.JCheckBox;
import javax.swing.JFrame;
import javax.swing.JTextField;
-/**
- *
- * @author vic
- */
public class RFTOptionsPanel extends javax.swing.JPanel implements ItemListener {
/** Creates new form RFTOptions */
@@ -31,47 +23,49 @@
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
- jLabel1 = new javax.swing.JLabel();
- binary = new javax.swing.JCheckBox();
- jLabel2 = new javax.swing.JLabel();
- blockSize = new javax.swing.JTextField();
+// jLabel1 = new javax.swing.JLabel();
+// binary = new javax.swing.JCheckBox();
+// jLabel2 = new javax.swing.JLabel();
+// blockSize = new javax.swing.JTextField();
jLabel3 = new javax.swing.JLabel();
tcpBufferSize = new javax.swing.JTextField();
jLabel4 = new javax.swing.JLabel();
jLabel5 = new javax.swing.JLabel();
- jLabel6 = new javax.swing.JLabel();
- noTpt = new javax.swing.JCheckBox();
+// jLabel6 = new javax.swing.JLabel();
+// noTpt = new javax.swing.JCheckBox();
jLabel7 = new javax.swing.JLabel();
parallelStream = new javax.swing.JTextField();
- jLabel8 = new javax.swing.JLabel();
- dCAU = new javax.swing.JCheckBox();
+// jLabel8 = new javax.swing.JLabel();
+// dCAU = new javax.swing.JCheckBox();
jLabel9 = new javax.swing.JLabel();
concurrent = new javax.swing.JTextField();
jLabel10 = new javax.swing.JLabel();
sourceSN = new javax.swing.JTextField();
jLabel11 = new javax.swing.JLabel();
destSN = new javax.swing.JTextField();
- jLabel12 = new javax.swing.JLabel();
- allOrNone = new javax.swing.JCheckBox();
- jLabel13 = new javax.swing.JLabel();
- maxAttempts = new javax.swing.JTextField();
+// enable_rft = new javax.swing.JLabel();
+// enable_rft_checkbox = new javax.swing.JCheckBox();
+// jLabel12 = new javax.swing.JLabel();
+// allOrNone = new javax.swing.JCheckBox();
+ //jLabel13 = new javax.swing.JLabel();
+// maxAttempts = new javax.swing.JTextField();
org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(org.globus.transfer.reliable.client.GridFTPGUIApp.class).getContext().getResourceMap(RFTOptionsPanel.class);
setBorder(javax.swing.BorderFactory.createTitledBorder(resourceMap.getString("Form.border.title"))); // NOI18N
setName("Form"); // NOI18N
- jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N
- jLabel1.setName("jLabel1"); // NOI18N
+// jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N
+// jLabel1.setName("jLabel1"); // NOI18N
+//
+// binary.setText(resourceMap.getString("binary.text")); // NOI18N
+// binary.setName("binary"); // NOI18N
+//
+// jLabel2.setText(resourceMap.getString("jLabel2.text")); // NOI18N
+// jLabel2.setName("jLabel2"); // NOI18N
+//
+// blockSize.setText(resourceMap.getString("blockSize.text")); // NOI18N
+// blockSize.setName("blockSize"); // NOI18N
- binary.setText(resourceMap.getString("binary.text")); // NOI18N
- binary.setName("binary"); // NOI18N
-
- jLabel2.setText(resourceMap.getString("jLabel2.text")); // NOI18N
- jLabel2.setName("jLabel2"); // NOI18N
-
- blockSize.setText(resourceMap.getString("blockSize.text")); // NOI18N
- blockSize.setName("blockSize"); // NOI18N
-
jLabel3.setText(resourceMap.getString("jLabel3.text")); // NOI18N
jLabel3.setName("jLabel3"); // NOI18N
@@ -83,25 +77,27 @@
jLabel5.setText(resourceMap.getString("jLabel5.text")); // NOI18N
jLabel5.setName("jLabel5"); // NOI18N
+
+ //enable_rft.setText("enable RFT");
- jLabel6.setText(resourceMap.getString("jLabel6.text")); // NOI18N
- jLabel6.setName("jLabel6"); // NOI18N
+// jLabel6.setText(resourceMap.getString("jLabel6.text")); // NOI18N
+// jLabel6.setName("jLabel6"); // NOI18N
+//
+// noTpt.setText(resourceMap.getString("noTpt.text")); // NOI18N
+// noTpt.setName("noTpt"); // NOI18N
- noTpt.setText(resourceMap.getString("noTpt.text")); // NOI18N
- noTpt.setName("noTpt"); // NOI18N
-
jLabel7.setText(resourceMap.getString("jLabel7.text")); // NOI18N
jLabel7.setName("jLabel7"); // NOI18N
parallelStream.setText(resourceMap.getString("parallelStream.text")); // NOI18N
parallelStream.setName("parallelStream"); // NOI18N
- jLabel8.setText(resourceMap.getString("jLabel8.text")); // NOI18N
- jLabel8.setName("jLabel8"); // NOI18N
+// jLabel8.setText(resourceMap.getString("jLabel8.text")); // NOI18N
+// jLabel8.setName("jLabel8"); // NOI18N
+//
+// dCAU.setText(resourceMap.getString("dCAU.text")); // NOI18N
+// dCAU.setName("dCAU"); // NOI18N
- dCAU.setText(resourceMap.getString("dCAU.text")); // NOI18N
- dCAU.setName("dCAU"); // NOI18N
-
jLabel9.setText(resourceMap.getString("jLabel9.text")); // NOI18N
jLabel9.setName("jLabel9"); // NOI18N
@@ -120,121 +116,228 @@
destSN.setText(resourceMap.getString("destSN.text")); // NOI18N
destSN.setName("destSN"); // NOI18N
- jLabel12.setText(resourceMap.getString("jLabel12.text")); // NOI18N
- jLabel12.setName("jLabel12"); // NOI18N
+// jLabel12.setText(resourceMap.getString("jLabel12.text")); // NOI18N
+// jLabel12.setName("jLabel12"); // NOI18N
+//
+// allOrNone.setText(resourceMap.getString("allOrNone.text")); // NOI18N
+// allOrNone.setName("allOrNone"); // NOI18N
- allOrNone.setText(resourceMap.getString("allOrNone.text")); // NOI18N
- allOrNone.setName("allOrNone"); // NOI18N
+// jLabel13.setText(resourceMap.getString("jLabel13.text")); // NOI18N
+// jLabel13.setName("jLabel13"); // NOI18N
- jLabel13.setText(resourceMap.getString("jLabel13.text")); // NOI18N
- jLabel13.setName("jLabel13"); // NOI18N
+// maxAttempts.setText(resourceMap.getString("maxAttempts.text")); // NOI18N
+// maxAttempts.setName("maxAttempts"); // NOI18N
- maxAttempts.setText(resourceMap.getString("maxAttempts.text")); // NOI18N
- maxAttempts.setName("maxAttempts"); // NOI18N
-
org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
this.setLayout(layout);
+
+ /////////////////////////////////////////////////////////////////////////////////////////////////
+
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(org.jdesktop.layout.GroupLayout.LEADING, jLabel11)
- .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 46, Short.MAX_VALUE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(binary)
- .add(44, 44, 44)
- .add(jLabel6)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED))
- .add(layout.createSequentialGroup()
- .add(jLabel7, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 90, Short.MAX_VALUE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(parallelStream, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 35, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(18, 18, 18))
- .add(layout.createSequentialGroup()
- .add(jLabel10)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)))
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(noTpt)
- .add(38, 38, 38)
- .add(jLabel8)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(dCAU)
- .add(31, 31, 31)
- .add(jLabel12, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 74, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(allOrNone))
- .add(layout.createSequentialGroup()
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(jLabel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 70, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(blockSize, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jLabel4)
- .add(30, 30, 30)
- .add(jLabel3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(tcpBufferSize, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jLabel5)
- .add(32, 32, 32)
- .add(jLabel13, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 85, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(concurrent, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 32, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(18, 18, 18)
- .add(jLabel9)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(maxAttempts, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 37, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
- .add(org.jdesktop.layout.GroupLayout.LEADING, destSN)
- .add(org.jdesktop.layout.GroupLayout.LEADING, sourceSN, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 723, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
- .add(23, 23, 23))
- );
+ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .addContainerGap()
+ .add(64, 64, 64)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jLabel7)
+ //.add(jLabel9)
+ .add(jLabel3))
+ //.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
+ .add(parallelStream, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 76, Short.MAX_VALUE)
+ //.add(concurrent, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 76, Short.MAX_VALUE)
+ .add(tcpBufferSize, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 76, Short.MAX_VALUE))
+
+ //.add(jLabel4)
+ //.add(93, 93, 93)
+// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+//// .add(layout.createSequentialGroup()
+//// .add(enable_rft, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+//// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+//// .add(enable_rft_checkbox))
+// )
+// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+//
+// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+//
+// .addContainerGap()
+
+ )
+// .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+//// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+////// .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
+////// //.add(jLabel10)
+////// //.add(34, 34, 34)
+////// //.add(sourceSN, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 677, Short.MAX_VALUE)
+////// )
+////// .add(layout.createSequentialGroup()
+////// //.add(jLabel11)
+////// //.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+////// //.add(destSN, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 677, Short.MAX_VALUE)
+////// )
+//// )
+// .add(262, 262, 262))
+ ))
+ );
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 24, Short.MAX_VALUE)
- .add(binary)
- .add(jLabel6)
- .add(noTpt)
- .add(jLabel8)
- .add(dCAU)
- .add(jLabel12)
- .add(allOrNone))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel7)
- .add(parallelStream, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(blockSize, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel4)
- .add(jLabel3)
- .add(tcpBufferSize, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel5)
- .add(jLabel13)
- .add(concurrent, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 20, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel9)
- .add(maxAttempts, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 24, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(sourceSN, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel10))
- .add(18, 18, 18)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel11)
- .add(destSN, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- );
+ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .add(26, 26, 26)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(jLabel7)
+ .add(parallelStream, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+// .add(jLabel3)
+// .add(tcpBufferSize, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+// .add(jLabel4)
+ )
+ .add(11, 11, 11)
+// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+// .add(jLabel9)
+// .add(concurrent, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+//
+// )
+//// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+//// .add(enable_rft)
+//// .add(enable_rft_checkbox))
+// )
+// .add(11, 11, 11)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(jLabel3)
+ .add(tcpBufferSize, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ //.add(jLabel4)
+ )
+// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+// .add(enable_rft)
+// .add(enable_rft_checkbox))
+ )
+ //.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+// //.add(jLabel10)
+// //.add(sourceSN, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+// )
+ //.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+// //.add(jLabel11)
+// //.add(destSN, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+// )
+ //.addContainerGap(127, Short.MAX_VALUE)
+ )
+ );
+
+
+ ////////////////////////////////////////////////////////////////////////////////////////////////
+// layout.setHorizontalGroup(
+// layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+// .add(layout.createSequentialGroup()
+// .addContainerGap()
+// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+// .add(org.jdesktop.layout.GroupLayout.LEADING, jLabel11)
+// .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
+// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+//// .add(layout.createSequentialGroup()
+//// .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 46, Short.MAX_VALUE)
+//// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+//// .add(binary)
+//// .add(44, 44, 44)
+//// .add(jLabel6)
+//// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED))
+// .add(layout.createSequentialGroup()
+// .add(jLabel7, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 90, Short.MAX_VALUE)
+// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+// .add(parallelStream, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 35, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+// .add(18, 18, 18))
+// .add(layout.createSequentialGroup()
+// .add(jLabel10)
+// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)))
+// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+//// .add(layout.createSequentialGroup()
+//// .add(noTpt)
+//// .add(38, 38, 38)
+//// .add(jLabel8)
+//// .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+//// .add(dCAU)
+//// .add(31, 31, 31)
+//// .add(jLabel12, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 74, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+//// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+//// .add(allOrNone)
+// )
+// .add(layout.createSequentialGroup()
+// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+// .add(layout.createSequentialGroup()
+//// .add(jLabel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 70, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+//// .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+//// .add(blockSize, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+//// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+// .add(jLabel4)
+// .add(30, 30, 30)
+// .add(jLabel3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+// .add(tcpBufferSize, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+// .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+// .add(jLabel5)
+// .add(32, 32, 32)
+//// .add(jLabel13, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 85, org.jdeskto...
[truncated message content] |
