Skip to content

Commit 549b5d8

Browse files
author
Steve Ives
committed
Reverted HarmonyCoreGenerator to previous version.
1 parent 0681be2 commit 549b5d8

File tree

8 files changed

+23
-102
lines changed

8 files changed

+23
-102
lines changed

‎HarmonyCoreGenerator/HarmonyCoreGenerator.synproj‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,6 @@
6363
<TargetRuntimeLevel>100101</TargetRuntimeLevel>
6464
</PropertyGroup>
6565
<ItemGroup>
66-
<Reference Include="DevExpress.Data.v19.2, Version=19.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
67-
<HintPath>C:\Program Files (x86)\DevExpress 19.2\Components\Bin\Framework\DevExpress.Data.v19.2.dll</HintPath>
68-
<Private>true</Private>
69-
</Reference>
70-
<Reference Include="DevExpress.Mvvm.v19.2, Version=19.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
71-
<HintPath>C:\Program Files (x86)\DevExpress 19.2\Components\Bin\Framework\DevExpress.Mvvm.v19.2.dll</HintPath>
72-
<Private>true</Private>
73-
</Reference>
74-
<Reference Include="DevExpress.Xpf.Core.v19.2, Version=19.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
75-
<HintPath>C:\Program Files (x86)\DevExpress 19.2\Components\Bin\Framework\DevExpress.Xpf.Core.v19.2.dll</HintPath>
76-
<Private>true</Private>
77-
</Reference>
78-
<Reference Include="DevExpress.Xpf.LayoutControl.v19.2, Version=19.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
79-
<HintPath>C:\Program Files (x86)\DevExpress 19.2\Components\Bin\Framework\DevExpress.Xpf.LayoutControl.v19.2.dll</HintPath>
80-
<Private>true</Private>
81-
</Reference>
8266
<Reference Include="Microsoft.VisualStudio.Threading, Version=16.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
8367
<HintPath>..\packages\Microsoft.VisualStudio.Threading.16.4.16\lib\net472\Microsoft.VisualStudio.Threading.dll</HintPath>
8468
<Private>true</Private>
@@ -126,9 +110,6 @@
126110
<RequiredTargetFramework>4.0</RequiredTargetFramework>
127111
</Reference>
128112
<Reference Include="UIAutomationProvider" />
129-
<Reference Include="UIAutomationTypes, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
130-
<HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5.1\UIAutomationTypes.dll</HintPath>
131-
</Reference>
132113
<Reference Include="WindowsBase" />
133114
<Reference Include="PresentationCore" />
134115
<Reference Include="PresentationFramework" />
@@ -163,9 +144,6 @@
163144
<DependentUpon>App.xaml</DependentUpon>
164145
<SubType>Code</SubType>
165146
</Compile>
166-
<Compile Include="View\StructuresView.xaml.dbl">
167-
<DependentUpon>View\StructuresView.xaml</DependentUpon>
168-
</Compile>
169147
<Page Include="Resources\Styles.xaml">
170148
<SubType>Designer</SubType>
171149
<Generator>MSBuild:Compile</Generator>
@@ -174,10 +152,6 @@
174152
<SubType>Designer</SubType>
175153
<Generator>MSBuild:Compile</Generator>
176154
</Page>
177-
<Page Include="View\StructuresView.xaml">
178-
<SubType>Designer</SubType>
179-
<Generator>MSBuild:Compile</Generator>
180-
</Page>
181155
</ItemGroup>
182156
<ItemGroup>
183157
<Compile Include="Properties\AssemblyInfo.dbl">

‎HarmonyCoreGenerator/Model/ODataStructureRow.dbl‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,6 @@ namespace HarmonyCoreGenerator.Model
8181
endmethod
8282
endproperty
8383

84-
private _exposeForBridge, boolean
85-
86-
public property ExposeForBridge, boolean
87-
method get
88-
proc
89-
mreturn _exposeForBridge
90-
endmethod
91-
method set
92-
proc
93-
if (!_exposeForBridge.Equals(value))
94-
_exposeForBridge = value
95-
NotifyPropertyChanged(^nameof(ExposeForBridge))
96-
endmethod
97-
endproperty
98-
9984
endclass
10085

10186
endnamespace

‎HarmonyCoreGenerator/Properties/AssemblyInfo.dbl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ import System.Runtime.CompilerServices;
4343
; Revision
4444
;
4545
{assembly: AssemblyVersion("1.0.0.0")}
46-
{assembly: AssemblyFileVersion("5.5.1.0")}
46+
{assembly: AssemblyFileVersion("5.4.9.0")}

‎HarmonyCoreGenerator/View/MainWindow.xaml‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:v="clr-namespace:HarmonyCoreGenerator.View"
76
xmlns:vm="clr-namespace:HarmonyCoreGenerator.ViewModel"
87
xmlns:tools="clr-namespace:MvvmTools;assembly=MvvmTools"
98
tools:HelpProvider.HelpTopic="IDH_Introduction"
@@ -280,18 +279,6 @@
280279

281280
</TabItem>
282281

283-
<!-- NEW UI -->
284-
285-
<TabItem
286-
x:Name="ODataApisTabNew"
287-
Header="OData API's"
288-
tools:HelpProvider.HelpTopic="IDH_StructureSelection"
289-
Visibility="{Binding SolutionTabsVisible, Converter={StaticResource BoolToVisibility}}">
290-
291-
<v:StructuresView DataContext="{Binding}" />
292-
293-
</TabItem>
294-
295282
<!-- TAB 1: ODATA API's -->
296283

297284
<TabItem
@@ -339,6 +326,13 @@
339326
Binding="{Binding Alias}">
340327
</DataGridTextColumn>
341328

329+
<!--<DataGridComboBoxColumn
330+
Header="Processing Mode"
331+
Width="*"
332+
ItemsSource="{StaticResource ODataProcessingModes}"
333+
SelectedValueBinding="{Binding ProcessingMode}">
334+
</DataGridComboBoxColumn>-->
335+
342336
<DataGridTemplateColumn
343337
Header="Processing Mode"
344338
Width="*">

‎HarmonyCoreGenerator/ViewModel/CloseSolutionCommand.dbl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ namespace HarmonyCoreGenerator.ViewModel
4949
SettingsFile = String.Empty
5050
CodeGenOutput.Clear()
5151
Options = new HarmonyCoreOptions()
52-
Repository = ^null
5352
SelectedTabIndex = (int)MainWindowTabPages.SolutionInfo
5453

5554
Properties.Settings.Default.LastSolution = String.Empty

‎HarmonyCoreGenerator/ViewModel/GeneratorProperties.dbl‎

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import System.Collections.ObjectModel
55
import System.Text
66
import CodeGen.Engine
77
import CodeGen.MethodCatalogAPI
8-
import CodeGen.RepositoryAPI
98
import HarmonyCoreGenerator.Model
109
import MvvmTools
1110
import System.Windows
@@ -382,41 +381,7 @@ namespace HarmonyCoreGenerator.ViewModel
382381
end
383382
endmethod
384383
endproperty
385-
386-
private _Repository, @Repository
387-
388-
public property Repository, @Repository
389-
method get
390-
proc
391-
mreturn _Repository
392-
endmethod
393-
method set
394-
proc
395-
if ((_Repository == ^null) || (_Repository != value))
396-
begin
397-
_Repository = value
398-
NotifyPropertyChanged(^nameof(Repository))
399-
end
400-
endmethod
401-
endproperty
402-
403-
private _StructureToAdd, string, String.Empty
404-
405-
public property StructureToAdd, string
406-
method get
407-
proc
408-
mreturn _StructureToAdd
409-
endmethod
410-
method set
411-
proc
412-
if (!_StructureToAdd.Equals(value))
413-
begin
414-
_StructureToAdd = value
415-
NotifyPropertyChanged(^nameof(StructureToAdd))
416-
end
417-
endmethod
418-
endproperty
419-
384+
420385
endclass
421386

422387
endnamespace

‎HarmonyCoreGenerator/ViewModel/OpenSoluitionCommand.dbl‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,6 @@ namespace HarmonyCoreGenerator.ViewModel
222222
end
223223
end
224224

225-
;;Load the
226-
227225
;; Check for repository changes
228226
;TODO: Need to make this happen after the UI has been painted.
229227
refreshRepository(false)
@@ -422,8 +420,15 @@ namespace HarmonyCoreGenerator.ViewModel
422420

423421
if (errors.Count == 0)
424422
begin
425-
Repository = new Repository(Options.RepositoryMainFile, Options.RepositoryTextFile, false)
426-
423+
data rps = new Repository(Options.RepositoryMainFile, Options.RepositoryTextFile, false)
424+
begin
425+
data str, @RpsStructure
426+
foreach str in rps.Structures
427+
begin
428+
Options.ODataStructures.Add(new ODataStructureRow(str))
429+
Options.BridgeStructures.Add(new BridgeStructureRow(str))
430+
end
431+
end
427432
;; For new projects, show the OData Features tab
428433
if (errors.Count == 0)
429434
begin
@@ -482,7 +487,6 @@ namespace HarmonyCoreGenerator.ViewModel
482487
ODataTaskSetFile = String.Empty
483488
BridgeTaskSetFile = String.Empty
484489
Options = new HarmonyCoreOptions()
485-
Repository = ^null
486490
end
487491

488492
endmethod

‎HarmonyCoreGenerator/ViewModel/RefreshRepositoryCommand.dbl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ namespace HarmonyCoreGenerator.ViewModel
3636
private method refreshRepository, void
3737
required in showNoChangesMessage, boolean
3838
proc
39-
Repository = new Repository(Options.RepositoryMainFile, Options.RepositoryTextFile, false)
40-
39+
data rps = new Repository(Options.RepositoryMainFile, Options.RepositoryTextFile, false)
40+
4141
;;Look for structures in our OData structures list that are no longer in the repository
4242

4343
data ODataRow, @ODataStructureRow
4444
data ODatarowsToDelete = new List<ODataStructureRow>()
4545

4646
foreach ODataRow in Options.ODataStructures
4747
begin
48-
if (!Repository.Structures.Any(lambda (s) { s.Name.Equals(ODataRow.Name) }))
48+
if (!rps.Structures.Any(lambda (s) { s.Name.Equals(ODataRow.Name) }))
4949
begin
5050
ODatarowsToDelete.Add(ODataRow)
5151
end
@@ -58,7 +58,7 @@ namespace HarmonyCoreGenerator.ViewModel
5858

5959
foreach BridgeRow in Options.BridgeStructures
6060
begin
61-
if (!Repository.Structures.Any(lambda (s) { s.Name.Equals(BridgeRow.Name) }))
61+
if (!rps.Structures.Any(lambda (s) { s.Name.Equals(BridgeRow.Name) }))
6262
begin
6363
BridgeRowsToDelete.Add(BridgeRow)
6464
end
@@ -70,7 +70,7 @@ namespace HarmonyCoreGenerator.ViewModel
7070
data ODataStructuresToAdd = new List<RpsStructure>()
7171
data BridgeStructuresToAdd = new List<RpsStructure>()
7272

73-
foreach str in Repository.Structures
73+
foreach str in rps.Structures
7474
begin
7575
;; OData
7676
if (!Options.ODataStructures.Any(lambda(s) { s.Name.Equals(str.Name) }))

0 commit comments

Comments
 (0)