Skip to content

Commit

Permalink
Merge pull request #452 from UiPath/fix/STUD-72718_java_type_cache
Browse files Browse the repository at this point in the history 
Java: Type cache (24.12) [STUD-72718]
  • Loading branch information
@viogroza
viogroza authored Dec 9, 2024
2 parents cd916ca + e1bc0dc commit d604f51
Show file tree
Hide file tree
Showing 17 changed files with 546 additions and 254 deletions.
20 changes: 13 additions & 7 deletions Activities/Activities.Java.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30621.155
# Visual Studio Version 17
VisualStudioVersion = 17.12.35514.174
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UiPath.Java", "Java\UiPath.Java\UiPath.Java.csproj", "{89957ABF-8A15-484A-94BA-6565969046AD}"
EndProject
Expand All @@ -21,12 +21,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UiPath.TestUtils", "Shared\UiPath.TestUtils\UiPath.TestUtils.csproj", "{D2C94889-1E86-4ABD-9D5E-631B3463DA86}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UiPath.Java.Activities.ViewModels", "Java\UiPath.Java.Activities.ViewModels\UiPath.Java.Activities.ViewModels.csproj", "{08C8716A-5902-4E2F-B5CB-B3977D0A7506}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Shared\UiPath.Shared.Activities.Design\UiPath.Shared.Activities.Design.projitems*{5e102b9e-dcef-4d8b-8a02-3fdf0fcc0d59}*SharedItemsImports = 5
Shared\UiPath.Shared.Activities\UiPath.Shared.Activities.projitems*{7747a478-8986-4a56-8342-093752fc07c3}*SharedItemsImports = 5
Shared\UiPath.Shared\UiPath.Shared.projitems*{7747a478-8986-4a56-8342-093752fc07c3}*SharedItemsImports = 5
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Expand Down Expand Up @@ -56,11 +53,20 @@ Global
{D2C94889-1E86-4ABD-9D5E-631B3463DA86}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D2C94889-1E86-4ABD-9D5E-631B3463DA86}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D2C94889-1E86-4ABD-9D5E-631B3463DA86}.Release|Any CPU.Build.0 = Release|Any CPU
{08C8716A-5902-4E2F-B5CB-B3977D0A7506}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08C8716A-5902-4E2F-B5CB-B3977D0A7506}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08C8716A-5902-4E2F-B5CB-B3977D0A7506}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08C8716A-5902-4E2F-B5CB-B3977D0A7506}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5AC55779-EA32-41AD-BAAD-1808F8A412CB}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Shared\UiPath.Shared.Activities.Design\UiPath.Shared.Activities.Design.projitems*{5e102b9e-dcef-4d8b-8a02-3fdf0fcc0d59}*SharedItemsImports = 5
Shared\UiPath.Shared.Activities\UiPath.Shared.Activities.projitems*{7747a478-8986-4a56-8342-093752fc07c3}*SharedItemsImports = 5
Shared\UiPath.Shared\UiPath.Shared.projitems*{7747a478-8986-4a56-8342-093752fc07c3}*SharedItemsImports = 5
EndGlobalSection
EndGlobal
95 changes: 51 additions & 44 deletions Activities/Java/UiPath.Java.Activities.Design/ConvertJavaObjectDesigner.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,51 @@
<sap:ActivityDesigner x:Class="UiPath.Java.Activities.Design.ConvertJavaObjectDesigner"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation"
xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation"
xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation"
xmlns:uip="clr-namespace:UiPath.Activities.Presentation"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:local="clr-namespace:UiPath.Java;assembly=UiPath.Java"
xmlns:src="clr-namespace:UiPath.Java.Activities.Design"
xmlns:p="clr-namespace:UiPath.Java.Activities.Design.Properties">
<sap:ActivityDesigner.Resources>
<ResourceDictionary>
<sapc:ArgumentToExpressionConverter x:Key="ArgumentToExpressionConverter" />
<sapc:ModelToObjectValueConverter x:Key="ModelToObjectValueConverter" />
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Themes/Generic.xaml" />
</ResourceDictionary.MergedDictionaries>

</ResourceDictionary>
</sap:ActivityDesigner.Resources>

<uip:ActivityDecoratorControl Style="{StaticResource ActivityDecoratorStyle}">
<Grid Width="300">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>

<Label Content="{x:Static p:Resources.JavaObjectLabel}"/>
<sapv:ExpressionTextBox Grid.Column="1" OwnerActivity="{Binding ModelItem}" ExpressionType="local:JavaObject" HintText="{x:Static p:Resources.JavaObjectHint}" Margin="0, 0, 0, 5"
Expression="{Binding Path=ModelItem.JavaObject, Converter={StaticResource ArgumentToExpressionConverter}, ConverterParameter=In, Mode=TwoWay}" />

<Label Grid.Row="1" Content="{x:Static p:Resources.ResultLabel}"/>
<sapv:ExpressionTextBox Name="Expr" Grid.Row="1" Grid.Column="1" OwnerActivity="{Binding ModelItem}" ExpressionType="{Binding Path=ModelItem.ActivityType, Converter={StaticResource ModelToObjectValueConverter}, Mode=OneTime}" HintText="{x:Static p:Resources.InvokeMethodResultHintText}"
Expression="{Binding Path=ModelItem.Result, Converter={StaticResource ArgumentToExpressionConverter}, ConverterParameter=Out, Mode=TwoWay}" UseLocationExpression="True" />

</Grid>
</uip:ActivityDecoratorControl>
</sap:ActivityDesigner>
<sap:ActivityDesigner x:Class="UiPath.Java.Activities.Design.ConvertJavaObjectDesigner"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation"
xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation"
xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation"
xmlns:uip="clr-namespace:UiPath.Activities.Presentation"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:local="clr-namespace:UiPath.Java;assembly=UiPath.Java"
xmlns:src="clr-namespace:UiPath.Java.Activities.Design"
xmlns:p="clr-namespace:UiPath.Java.Activities.Design.Properties"
xmlns:uipc="clr-namespace:UiPath.Activities.Presentation.Converters">

<sap:ActivityDesigner.Resources>
<ResourceDictionary>
<sapc:ArgumentToExpressionConverter x:Key="ArgumentToExpressionConverter" />
<sapc:ModelToObjectValueConverter x:Key="ModelToObjectValueConverter" />
<uipc:ActivityIconConverter x:Key="ActivityIconConverter" />
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Themes/Generic.xaml" />
<ResourceDictionary Source="Themes/Icons.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</sap:ActivityDesigner.Resources>

<sap:ActivityDesigner.Icon>
<DrawingBrush Stretch="Uniform" Drawing="{Binding Path=ModelItem, Converter={StaticResource ActivityIconConverter}}" />
</sap:ActivityDesigner.Icon>

<uip:ActivityDecoratorControl Style="{StaticResource ActivityDecoratorStyle}">
<Grid Width="300">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>

<Label Content="{x:Static p:Resources.JavaObjectLabel}"/>
<sapv:ExpressionTextBox Grid.Column="1" OwnerActivity="{Binding ModelItem}" ExpressionType="local:JavaObject" HintText="{x:Static p:Resources.JavaObjectHint}" Margin="0, 0, 0, 5"
Expression="{Binding Path=ModelItem.JavaObject, Converter={StaticResource ArgumentToExpressionConverter}, ConverterParameter=In, Mode=TwoWay}" />

<Label Grid.Row="1" Content="{x:Static p:Resources.ResultLabel}"/>
<sapv:ExpressionTextBox Name="Expr" Grid.Row="1" Grid.Column="1" OwnerActivity="{Binding ModelItem}" ExpressionType="{Binding Path=ModelItem.ActivityType, Converter={StaticResource ModelToObjectValueConverter}, Mode=OneTime}" HintText="{x:Static p:Resources.InvokeMethodResultHintText}"
Expression="{Binding Path=ModelItem.Result, Converter={StaticResource ArgumentToExpressionConverter}, ConverterParameter=Out, Mode=TwoWay}" UseLocationExpression="True" />

</Grid>
</uip:ActivityDecoratorControl>
</sap:ActivityDesigner>
83 changes: 45 additions & 38 deletions Activities/Java/UiPath.Java.Activities.Design/CreateJavaObjectDesigner.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,45 @@
<sap:ActivityDesigner x:Class="UiPath.Java.Activities.Design.CreateJavaObjectDesigner"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation"
xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation"
xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation"
xmlns:uip="clr-namespace:UiPath.Activities.Presentation"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:local="clr-namespace:UiPath.Java;assembly=UiPath.Java"
xmlns:p="clr-namespace:UiPath.Java.Activities.Design.Properties">
<sap:ActivityDesigner.Resources>
<ResourceDictionary>
<sapc:ArgumentToExpressionConverter x:Key="ArgumentToExpressionConverter" />
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Themes/Generic.xaml" />
</ResourceDictionary.MergedDictionaries>

</ResourceDictionary>
</sap:ActivityDesigner.Resources>

<uip:ActivityDecoratorControl Style="{StaticResource ActivityDecoratorStyle}">
<StackPanel Width="300">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition/>
</Grid.RowDefinitions>

<Label Content="{x:Static p:Resources.TargetTypeLabel}"/>
<sapv:ExpressionTextBox Grid.Column="1" OwnerActivity="{Binding ModelItem}" ExpressionType="sys:String" HintText="{x:Static p:Resources.TargetTypeHintText}" Margin="0, 0, 0, 5"
Expression="{Binding Path=ModelItem.TargetType, Converter={StaticResource ArgumentToExpressionConverter}, ConverterParameter=In, Mode=TwoWay}" />
</Grid>
</StackPanel>
</uip:ActivityDecoratorControl>
</sap:ActivityDesigner>
<sap:ActivityDesigner x:Class="UiPath.Java.Activities.Design.CreateJavaObjectDesigner"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation"
xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation"
xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation"
xmlns:uip="clr-namespace:UiPath.Activities.Presentation"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:local="clr-namespace:UiPath.Java;assembly=UiPath.Java"
xmlns:p="clr-namespace:UiPath.Java.Activities.Design.Properties"
xmlns:uipc="clr-namespace:UiPath.Activities.Presentation.Converters">

<sap:ActivityDesigner.Resources>
<ResourceDictionary>
<sapc:ArgumentToExpressionConverter x:Key="ArgumentToExpressionConverter" />
<uipc:ActivityIconConverter x:Key="ActivityIconConverter" />
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Themes/Generic.xaml" />
<ResourceDictionary Source="Themes/Icons.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</sap:ActivityDesigner.Resources>

<sap:ActivityDesigner.Icon>
<DrawingBrush Stretch="Uniform" Drawing="{Binding Path=ModelItem, Converter={StaticResource ActivityIconConverter}}" />
</sap:ActivityDesigner.Icon>

<uip:ActivityDecoratorControl Style="{StaticResource ActivityDecoratorStyle}">
<StackPanel Width="300">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition/>
</Grid.RowDefinitions>

<Label Content="{x:Static p:Resources.TargetTypeLabel}"/>
<sapv:ExpressionTextBox Grid.Column="1" OwnerActivity="{Binding ModelItem}" ExpressionType="sys:String" HintText="{x:Static p:Resources.TargetTypeHintText}" Margin="0, 0, 0, 5"
Expression="{Binding Path=ModelItem.TargetType, Converter={StaticResource ArgumentToExpressionConverter}, ConverterParameter=In, Mode=TwoWay}" />
</Grid>
</StackPanel>
</uip:ActivityDecoratorControl>
</sap:ActivityDesigner>
Loading

0 comments on commit d604f51

Please sign in to comment.