Changeset 174

Timestamp:

03/09/07 01:23:50 (2 years ago)

Author:

ssamara2

Message:

Method_Builder.xaml is now fully functional. Ties in with the backend, and passes context (whatever that means). GenerateCode works too.

Files:

• TeachingSoftware/Backend/MethodComposite.cs (modified) (1 diff)
• TeachingSoftware/GUI/Method_Builder.xaml (modified) (3 diffs)
• TeachingSoftware/GUI/Method_Builder.xaml.cs (modified) (6 diffs)
• TeachingSoftware/JavaInitializer.cs (modified) (1 diff)

TeachingSoftware/Backend/MethodComposite.cs

@@ -105 +105 @@
-                        foreach (String element in parameterList)
-                        {
-!
+
-                                        returnString += element;
-                                else 
-", " + element
+element + ", "
-                        }
-

TeachingSoftware/GUI/Method_Builder.xaml

@@ -16 +16 @@
-                        <Label HorizontalAlignment="Left" Margin="250,150,0,0" x:Name="Label_AddParamaters" VerticalAlignment="Top" Height="26.936" Content="Add parameters:&#xd;&#xa;" FontFamily="Tahoma" FontSize="13"/>
-                        <TextBox HorizontalAlignment="Left" Margin="150,50,0,0" x:Name="Text_Name" VerticalAlignment="Top" Width="200" Text="" TextWrapping="Wrap"/>
-                        <TextBox HorizontalAlignment="Left" Margin="150,75,0,0" x:Name="Text_ReturnType" VerticalAlignment="Top" Width="200" Text="" TextWrapping="Wrap"/>
-                        <TextBox HorizontalAlignment="Left" Margin="325,200,50,0" x:Name="Text_ParameterName" VerticalAlignment="Top" Width="150" Text="" TextWrapping="Wrap"/>
-                        <ListBox HorizontalAlignment="Left" Margin="25,175,0,100" x:Name="List_Parameters" VerticalAlignment="Top" Width="200" Height="112.222" IsSynchronizedWithCurrentItem="True"/>
@@ -23 +22 @@
-                        <Button HorizontalAlignment="Left" Margin="175,300,0,0" x:Name="Button_Cancel" VerticalAlignment="Top" Content="Cancel" Click="Cancel_Clicked"/>
-                        <Button RenderTransformOrigin="10.083,10.87" d:LayoutOverrides="Width, Height" HorizontalAlignment="Left" Margin="275,225,275,125" x:Name="Button_Add" VerticalAlignment="Top" Content="Add" Click="Add_Parameter"/>
-Scope
+Permission
-                        <ComboBox HorizontalAlignment="Left" Margin="150,100,0,0" x:Name="Combo_Scope" VerticalAlignment="Top" Width="100" IsSynchronizedWithCurrentItem="True">
-                                <ListBoxItem Content="Private"/>
@@ -33 +32 @@
-                        <Label HorizontalAlignment="Left" Margin="275,200,0,0" x:Name="Label_ParamName" VerticalAlignment="Top" Content="Name:"/>
-                        <Label HorizontalAlignment="Left" Margin="275,175,0,0" x:Name="Label_ParamType" VerticalAlignment="Top" Content="Type:"/>
+                        <ComboBox HorizontalAlignment="Left" Margin="150,75,0,0" x:Name="Combo_Type" VerticalAlignment="Top" Width="100" ItemsSource = "{Binding}" IsSynchronizedWithCurrentItem="True"/>
-                </Grid>
-        </Grid>

TeachingSoftware/GUI/Method_Builder.xaml.cs

@@ -8 +8 @@
-using System.Windows.Media.Animation;
-using System.Windows.Navigation;
+using System.Collections;
+using System.Collections.Generic;
-
-namespace TeachingSoftware
@@ -13 +15 @@
-    public partial class Method_Builder
-    {
-
-        private BodyOfCode myContext;
-
@@ -21 +22 @@
-
-            this.Combo_ParameterTypes.DataContext = Project.getProgramClasses();
+            this.Combo_Type.DataContext = Project.getProgramClasses();
-        }
-
@@ -30 +32 @@
-            this.myContext = theContext;
-            this.Combo_ParameterTypes.DataContext = Project.getProgramClasses();
+            this.Combo_Type.DataContext = Project.getProgramClasses();
-        }
-
@@ -44 +47 @@
-        private void Submit_Clicked(object sender, RoutedEventArgs e)
-        {
-Text_ParameterName.Text == "") || (Text_ReturnType.Text == ""
+Combo_Type.SelectedIndex == -1) || (Combo_Scope.SelectedIndex == -1
-            {
-                MessageBox.Show("Please enter all information");
@@ -50 +53 @@
-            else
-            {
+                List<String> theList = new List<string>();
+                string test = Combo_Scope.SelectedItem.ToString();
+                for (int i = 0; i < List_Parameters.Items.Count; i++)
+                {
+                    //MessageBox.Show(Combo_ParameterTypes.Items.GetItemAt(i).ToString());
+                    theList.Add(List_Parameters.Items.GetItemAt(i).ToString());
+                    //test += Combo_ParameterTypes.Items.GetItemAt(i).ToString();
+                }
+
+                String[] array = Combo_Scope.SelectedItem.ToString().Split(' ');
+                String permission = (string)array.GetValue(1);
+
+                String type = Combo_Type.SelectedItem.ToString();
+                //String[] array2 = Combo_Type.SelectedItem.ToString().Split(' ');
+                //String type = (string)array2.GetValue(1);
+
+                MethodComposite theNewMethodComposite
+                    = new MethodComposite(permission, type, Text_Name.Text, theList);
+
+                //MessageBox.Show(test);
+                MessageBox.Show(theNewMethodComposite.generateCode(0));
+
+                Project.MainClass.addMethodDeclarations(theNewMethodComposite);
+
-                this.Close();
-            }

TeachingSoftware/JavaInitializer.cs

@@ -49 +49 @@
-
-                        ClassComposite defaultClass = new ClassComposite("Default", "public static", true);
-
+
+
-                        return defaultClass;
-