Skip to content

Commit

Permalink
Coding style: remove variable alignment.
Browse files Browse the repository at this point in the history
  • Loading branch information
Remi Caput committed Jan 29, 2017
1 parent e8fb776 commit d40e283
Show file tree
Hide file tree
Showing 78 changed files with 733 additions and 733 deletions.
102 changes: 51 additions & 51 deletions Cottle.Demo/src/DemoForm.cs
View file
Expand Up @@ -18,18 +18,18 @@ public partial class DemoForm : Form
{
#region Constants

private const string AUTOLOAD = "autoload.ctv";
private const string AUTOLOAD = "autoload.ctv";

#endregion

#region Attributes / Instance

private SettingForm.Parameters parameters = new SettingForm.Parameters
private SettingForm.Parameters parameters = new SettingForm.Parameters
{
BlockBegin = DefaultSetting.Instance.BlockBegin,
BlockContinue = DefaultSetting.Instance.BlockContinue,
BlockEnd = DefaultSetting.Instance.BlockEnd,
TrimmerIndex = TrimmerCollection.DEFAULT_INDEX
BlockBegin = DefaultSetting.Instance.BlockBegin,
BlockContinue = DefaultSetting.Instance.BlockContinue,
BlockEnd = DefaultSetting.Instance.BlockEnd,
TrimmerIndex = TrimmerCollection.DEFAULT_INDEX
};

#endregion
Expand All @@ -52,8 +52,8 @@ public DemoForm ()

private void buttonClean_Click (object sender, EventArgs e)
{
SimpleDocument document;
ISetting setting;
SimpleDocument document;
ISetting setting;

setting = this.SettingCreate ();

Expand All @@ -71,9 +71,9 @@ private void buttonClean_Click (object sender, EventArgs e)

private void buttonEvaluate_Click (object sender, EventArgs e)
{
SimpleDocument document;
ISetting setting;
IStore store;
SimpleDocument document;
ISetting setting;
IStore store;

setting = this.SettingCreate ();

Expand All @@ -98,15 +98,15 @@ private void buttonEvaluate_Click (object sender, EventArgs e)

private void toolStripMenuItemSetting_Click (object sender, EventArgs e)
{
Form form;
Form form;

form = new SettingForm ((p) => this.parameters = p, this.parameters);
form.ShowDialog (this);
}

private void toolStripMenuItemFileLoad_Click (object sender, EventArgs e)
{
OpenFileDialog dialog = new OpenFileDialog ();
OpenFileDialog dialog = new OpenFileDialog ();

dialog.Filter = "Cottle values file (*.ctv)|*.ctv|Any file (*.*)|*.*";

Expand All @@ -116,7 +116,7 @@ private void toolStripMenuItemFileLoad_Click (object sender, EventArgs e)

private void toolStripMenuItemFileSave_Click (object sender, EventArgs e)
{
SaveFileDialog dialog = new SaveFileDialog ();
SaveFileDialog dialog = new SaveFileDialog ();

dialog.Filter = "Cottle values file (*.ctv)|*.ctv|Any file (*.*)|*.*";

Expand All @@ -126,11 +126,11 @@ private void toolStripMenuItemFileSave_Click (object sender, EventArgs e)

private void toolStripMenuItemMoveDown_Click (object sender, EventArgs e)
{
TreeNodeCollection collection;
int index1;
int index2;
TreeNode node1 = this.contextMenuStripTree.Tag as TreeNode;
TreeNode node2;
TreeNodeCollection collection;
int index1;
int index2;
TreeNode node1 = this.contextMenuStripTree.Tag as TreeNode;
TreeNode node2;

if (node1 != null && node1.Parent != null && node1.NextNode != null)
{
Expand All @@ -151,11 +151,11 @@ private void toolStripMenuItemMoveDown_Click (object sender, EventArgs e)

private void toolStripMenuItemMoveUp_Click (object sender, EventArgs e)
{
TreeNodeCollection collection;
int index1;
int index2;
TreeNode node1 = this.contextMenuStripTree.Tag as TreeNode;
TreeNode node2;
TreeNodeCollection collection;
int index1;
int index2;
TreeNode node1 = this.contextMenuStripTree.Tag as TreeNode;
TreeNode node2;

if (node1 != null && node1.Parent != null && node1.PrevNode != null)
{
Expand All @@ -176,22 +176,22 @@ private void toolStripMenuItemMoveUp_Click (object sender, EventArgs e)

private void toolStripMenuItemNodeClone_Click (object sender, EventArgs e)
{
TreeNode node = this.contextMenuStripTree.Tag as TreeNode;
TreeNode node = this.contextMenuStripTree.Tag as TreeNode;

if (node != null && node.Parent != null)
node.Parent.Nodes.Insert (node.Index + 1, this.NodeClone (node));
}

private void toolStripMenuItemNodeCreate_Click (object sender, EventArgs e)
{
Form form;
TreeNode node = this.contextMenuStripTree.Tag as TreeNode;
Form form;
TreeNode node = this.contextMenuStripTree.Tag as TreeNode;

if (node != null)
{
form = new NodeForm (null, delegate (string key, Value value)
{
TreeNode child = this.NodeCreate (key, value);
TreeNode child = this.NodeCreate (key, value);

node.Nodes.Add (child);
node.Expand ();
Expand All @@ -203,16 +203,16 @@ private void toolStripMenuItemNodeCreate_Click (object sender, EventArgs e)

private void toolStripMenuItemNodeDelete_Click (object sender, EventArgs e)
{
TreeNode node = this.contextMenuStripTree.Tag as TreeNode;
TreeNode node = this.contextMenuStripTree.Tag as TreeNode;

if (node != null && node.Parent != null)
node.Remove ();
}

private void toolStripMenuItemNodeUpdate_Click (object sender, EventArgs e)
{
Form form;
TreeNode node = this.contextMenuStripTree.Tag as TreeNode;
Form form;
TreeNode node = this.contextMenuStripTree.Tag as TreeNode;

if (node != null)
{
Expand All @@ -233,8 +233,8 @@ private void toolStripMenuItemTreeExpand_Click (object sender, EventArgs e)

private void contextMenuStripTree_Opening (object sender, CancelEventArgs e)
{
TreeNode node = this.treeViewValue.SelectedNode;
NodeData data = node != null ? node.Tag as NodeData : null;
TreeNode node = this.treeViewValue.SelectedNode;
NodeData data = node != null ? node.Tag as NodeData : null;

this.toolStripMenuItemNodeClone.Enabled = node != null && node.Parent != null;
this.toolStripMenuItemNodeCreate.Enabled = node != null && node.Parent == null || (data != null && data.Value.Type == ValueContent.Map);
Expand All @@ -252,7 +252,7 @@ private void contextMenuStripTree_Opening (object sender, CancelEventArgs e)

private void DisplayError (ParseException exception)
{
int index;
int index;

index = this.textBoxInput.GetFirstCharIndexFromLine (exception.Line - 1) + exception.Column;

Expand All @@ -272,7 +272,7 @@ private void DisplayText (string text)

private void NodeAssign (TreeNode node, string key, Value value)
{
NodeData data = new NodeData (key, value);
NodeData data = new NodeData (key, value);

node.ImageIndex = data.ImageIndex;
node.SelectedImageIndex = data.ImageIndex;
Expand All @@ -294,8 +294,8 @@ private void NodeAssign (TreeNode node, string key, Value value)

private TreeNode NodeClone (TreeNode node)
{
NodeData data = node.Tag as NodeData;
TreeNode copy;
NodeData data = node.Tag as NodeData;
TreeNode copy;

if (data != null)
{
Expand All @@ -317,9 +317,9 @@ private TreeNode NodeClone (TreeNode node)

private TreeNode NodeCreate (string key, Value value)
{
TreeNode node;
TreeNode[] range;
int i;
TreeNode node;
TreeNode[] range;
int i;

node = new TreeNode ();

Expand Down Expand Up @@ -362,7 +362,7 @@ private TreeNode NodeCreate (string key, Value value)

private ISetting SettingCreate ()
{
CustomSetting setting;
CustomSetting setting;

setting = new CustomSetting ();
setting.BlockBegin = this.parameters.BlockBegin;
Expand All @@ -375,9 +375,9 @@ private ISetting SettingCreate ()

private void StateLoad (string path, bool dialog)
{
TreeNode root;
Dictionary<string, Value> values;
int version;
TreeNode root;
Dictionary<string, Value> values;
int version;

if (this.treeViewValue.Nodes.Count < 1)
return;
Expand Down Expand Up @@ -407,10 +407,10 @@ private void StateLoad (string path, bool dialog)

this.parameters = new SettingForm.Parameters
{
BlockBegin = reader.ReadString (),
BlockContinue = reader.ReadString (),
BlockEnd = reader.ReadString (),
TrimmerIndex = version > 1 ? reader.ReadInt32 () : TrimmerCollection.DEFAULT_INDEX
BlockBegin = reader.ReadString (),
BlockContinue = reader.ReadString (),
BlockEnd = reader.ReadString (),
TrimmerIndex = version > 1 ? reader.ReadInt32 () : TrimmerCollection.DEFAULT_INDEX
};

this.textBoxInput.Text = reader.ReadString ();
Expand All @@ -429,7 +429,7 @@ private void StateLoad (string path, bool dialog)

private void StateSave (string path)
{
Dictionary<string, Value> values = new Dictionary<string, Value> ();
Dictionary<string, Value> values = new Dictionary<string, Value> ();

foreach (TreeNode root in this.treeViewValue.Nodes)
{
Expand Down Expand Up @@ -462,8 +462,8 @@ private void StateSave (string path)

private List<KeyValuePair<Value, Value>> ValuesBuild (TreeNodeCollection nodes)
{
List<KeyValuePair<Value, Value>> collection = new List<KeyValuePair<Value,Value>> (nodes.Count);
NodeData data;
List<KeyValuePair<Value, Value>> collection = new List<KeyValuePair<Value,Value>> (nodes.Count);
NodeData data;

foreach (TreeNode node in nodes)
{
Expand Down
8 changes: 4 additions & 4 deletions Cottle.Demo/src/NodeData.cs
View file
Expand Up @@ -6,23 +6,23 @@ public class NodeData
{
#region Properties

public int ImageIndex
public int ImageIndex
{
get
{
return (int)this.value.Type;
}
}

public string Key
public string Key
{
get
{
return this.key;
}
}

public Value Value
public Value Value
{
get
{
Expand All @@ -42,7 +42,7 @@ public Value Value

#region Constructors

public NodeData (string key, Value value)
public NodeData (string key, Value value)
{
this.key = key;
this.value = value;
Expand Down
18 changes: 9 additions & 9 deletions Cottle.Demo/src/NodeForm.cs
View file
Expand Up @@ -10,13 +10,13 @@ public partial class NodeForm : Form
{
#region Attributes

private NodeAssignDelegate assign;
private NodeAssignDelegate assign;

#endregion

#region Constructors

public NodeForm (NodeData data, NodeAssignDelegate assign)
public NodeForm (NodeData data, NodeAssignDelegate assign)
{
this.assign = assign;

Expand Down Expand Up @@ -65,9 +65,9 @@ public NodeForm (NodeData data, NodeAssignDelegate assign)

#region Methods / Listeners

private void buttonAccept_Click (object sender, EventArgs e)
private void buttonAccept_Click (object sender, EventArgs e)
{
string key = this.textBoxName.Text;
string key = this.textBoxName.Text;
decimal number;

if (string.IsNullOrEmpty (key))
Expand Down Expand Up @@ -115,12 +115,12 @@ private void buttonAccept_Click (object sender, EventArgs e)
this.Close ();
}

private void buttonCancel_Click (object sender, EventArgs e)
private void buttonCancel_Click (object sender, EventArgs e)
{
this.Close ();
}

private void radioButtonValue_CheckedChanged (object sender, EventArgs e)
private void radioButtonValue_CheckedChanged (object sender, EventArgs e)
{
this.ApplyType ();
}
Expand All @@ -129,9 +129,9 @@ private void radioButtonValue_CheckedChanged (object sender, EventArgs e)

#region Methods / Private

private ValueContent ApplyType ()
private ValueContent ApplyType ()
{
ValueContent type;
ValueContent type;

if (this.radioButtonValueBoolean.Checked)
type = ValueContent.Boolean;
Expand All @@ -155,7 +155,7 @@ private ValueContent ApplyType ()

#region Types

public delegate void NodeAssignDelegate (string key, Value value);
public delegate void NodeAssignDelegate (string key, Value value);

#endregion
}
Expand Down

0 comments on commit d40e283

Please sign in to comment.