Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 1237 → Rev 1238

/TCPproxy/trunk/MainForm.cs
846,15 → 846,8
 
private void recentMenuItem_Click(object sender, EventArgs e)
{
int n = recentItems.Count-1;
foreach(MenuItem menuItem in recentListeningMenu.MenuItems) {
if(sender == menuItem) break;
n--;
}
if(n < 0)
throw new Exception("Unknown sender");
 
RecentItem recentItem = (RecentItem)recentItems[n];
MenuItem menuItem = (MenuItem)sender;
RecentItem recentItem = (RecentItem)recentItems[recentItems.Count - menuItem.Index - 1];
IPAddress resendIp;
 
this.listenPort = recentItem.ListenPort;
1030,7 → 1023,7
int existingIdx = recentItems.IndexOf(recentItem);
if(existingIdx >= 0) {
recentItems.RemoveAt(existingIdx);
this.recentListeningMenu.MenuItems.RemoveAt(recentItems.Count - existingIdx);
this.recentListeningMenu.MenuItems.RemoveAt(recentItems.Count - existingIdx - 1);
}
 
if(recentItems.Count == 0 && this.recentListeningMenu.MenuItems.Count == 1)
1053,14 → 1046,16
// update hot keys of old items
int count = 0;
foreach(MenuItem item in this.recentListeningMenu.MenuItems) {
RecentItem ri = (RecentItem)recentItems[recentItems.Count - count - 1];
 
if(count == 0) {
}
else if(count < 10)
item.Text = string.Format("&{3} {0} to {1}:{2}", recentItem.ListenPort,
recentItem.ResendHost, recentItem.ResendPort, count + 1);
item.Text = string.Format("&{3} {0} to {1}:{2}", ri.ListenPort,
ri.ResendHost, ri.ResendPort, count + 1);
else
item.Text = string.Format("{0} to {1}:{2}", recentItem.ListenPort,
recentItem.ResendHost, recentItem.ResendPort);
item.Text = string.Format("{0} to {1}:{2}", ri.ListenPort,
ri.ResendHost, ri.ResendPort);
count++;
}
}
1370,17 → 1365,22
}
}
 
private void AddTcpNodeInternal(TcpConnection tcp)
private string TcpNodeTitle(TcpConnection tcp)
{
return tcp.Id + " " + tcp.StartTimestamp.ToString("HH:mm:ss.ffff");
}
 
private void AddTcpNodeInternal(TcpConnection tcp)
{
TreeNode treeNode = new TreeNode(tcp.ToString());
TreeNode treeNode = new TreeNode(TcpNodeTitle(tcp));
TcpNodeData data = new TcpNodeData(this, treeNode);
 
data.Tcp = tcp;
data.Tcp = tcp;
treeNode.Tag = data;
treeNode.ImageIndex = (tcp.LocalState == SocketState.Closed
&& tcp.RemoteState == SocketState.Closed) ? 2 : 1;
treeNode.SelectedImageIndex = treeNode.ImageIndex;
treeNodes[tcp] = data;
treeNodes[tcp] = data;
 
messageView.Nodes.Add(treeNode);
treeNode.EnsureVisible();
1391,7 → 1391,7
TcpNodeData data = treeNodes[tcp] as TcpNodeData;
if(data == null) return; // might be call by Cancel
 
string title = tcp.ToString();
string title = TcpNodeTitle(tcp);
if(title != data.Node.Text) data.Node.Text = title;
if(tcp.LocalState == SocketState.Closed && tcp.RemoteState == SocketState.Closed)
{
1405,13 → 1405,19
data.Show();
}
 
private void AddHttpNodeInternal(TcpConnection tcp, HttpMessage http)
private string HttpNodeTitle(HttpMessage http)
{
return (http.Request.SoapAction != null ? ("SOAP " + http.Request.SoapAction)
: (http.Request.Method == null ? "" : http.Request.Method) + " " + (http.Request.Uri == null ? "" : http.Request.Uri));
}
 
private void AddHttpNodeInternal(TcpConnection tcp, HttpMessage http)
{
TreeNode treeNode = new TreeNode(http.ToString());
TreeNode treeNode = new TreeNode(HttpNodeTitle(http));
HttpNodeData data = new HttpNodeData(this, treeNode);
 
data.Http = http;
treeNode.Tag = data;
data.Http = http;
treeNode.Tag = data;
treeNodes[http] = data;
 
TcpNodeData tcpData = treeNodes[tcp] as TcpNodeData;
1427,7 → 1433,7
HttpNodeData httpData = treeNodes[http] as HttpNodeData;
if(httpData == null) return; // might be call by Cancel
 
string title = http.ToString();
string title = HttpNodeTitle(http);
if(httpData.Node.Text != title) httpData.Node.Text = title;
 
if(!httpData.RequestXmlShown && http.Request.Xml != null)
/TCPproxy/trunk/Network.cs
424,11 → 424,6
}
}
 
public override string ToString() // FIXME delete the method
{
return id + " " + startTimestamp.ToString("HH:mm:ss.ffff");
}
 
protected void SetLocalPoint(IPEndPoint localPoint)
{
this.localPoint = localPoint;
2345,12 → 2340,6
get { return response; }
}
 
public override string ToString() // FIXME delete the method
{
return (request.SoapAction != null ? ("SOAP " + request.SoapAction)
: (request.Method == null ? "" : request.Method) + " " + (request.Uri == null ? "" : request.Uri));
}
 
public event TcpEventHandler Update;
 
protected virtual void OnUpdate(TcpEventArgs e)
/TCPproxy/trunk/AboutForm.cs
131,8 → 131,8
 
private void AboutForm_Load(object sender, EventArgs e)
{
Assembly running = Assembly.GetExecutingAssembly();
AssemblyName name = running.GetName();
Assembly running = Assembly.GetExecutingAssembly();
AssemblyName name = running.GetName();
 
// get version
versionLabel.Text = string.Format("Version {0}.{1}.{2}",
154,8 → 154,8
}
 
// show
this.Text = string.Format("About {0}", title);
appNameLabel.Text = title;
this.Text = string.Format("About {0}", title);
appNameLabel.Text = title;
copyrightLabel.Text = copyright;
}
}