Skip to content

Commit

Permalink
fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@vdelachaux
vdelachaux committed Aug 29, 2023
1 parent 9629117 commit 4be5f59
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 90 deletions.
172 changes: 86 additions & 86 deletions Project/Sources/Methods/METHODS.4dm
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
//%attributes = {"invisible":true,"preemptive":"incapable"}
// ----------------------------------------------------
// Project method : Private_Methods - (4DPop Macros)
// ID[EA5BBFB3373B41AC87508A85117393FA]
// Créé le 30/10/12 par Super_Utilisateur
// ----------------------------------------------------
// Description:
//
// ----------------------------------------------------
// Declarations
// ----------------------------------------------------
// Project method : Private_Methods - (4DPop Macros)
// ID[EA5BBFB3373B41AC87508A85117393FA]
// Créé le 30/10/12 par Super_Utilisateur
// ----------------------------------------------------
// Description:
//
// ----------------------------------------------------
// Declarations
C_TEXT:C284($1)
C_TEXT:C284($2)

C_BOOLEAN:C305($Boo_checked)
C_LONGINT:C283($Lon_choice;$Lon_i;$Lon_parameters;$Lon_type;$Lon_x)
C_LONGINT:C283($Lon_choice; $Lon_i; $Lon_parameters; $Lon_type; $Lon_x)
C_POINTER:C301($Ptr_)
C_TEXT:C284($Mnu_main;$Mnu_module;$Txt_;$Txt_buffer;$Txt_entryPoint;$Txt_method)
C_TEXT:C284($Txt_tag;$Txt_target)
C_TEXT:C284($Mnu_main; $Mnu_module; $Txt_; $Txt_buffer; $Txt_entryPoint; $Txt_method)
C_TEXT:C284($Txt_tag; $Txt_target)

ARRAY TEXT:C222($tTxt_methods; 0x0000)

If (False:C215)
C_TEXT:C284(METHODS ;$1)
C_TEXT:C284(METHODS ;$2)
C_TEXT:C284(METHODS; $1)
C_TEXT:C284(METHODS; $2)
End if

// ----------------------------------------------------
// Initialisations
// ----------------------------------------------------
// Initialisations
$Lon_parameters:=Count parameters:C259

If (Asserted:C1132($Lon_parameters>=1;"Missing parameter"))
If (Asserted:C1132($Lon_parameters>=1; "Missing parameter"))

$Txt_entryPoint:=$1 //Action

Expand All @@ -36,29 +38,29 @@ Else

End if

// ----------------------------------------------------
// ----------------------------------------------------
Case of

//________________________________________
//________________________________________
: ($Txt_entryPoint="export") // #10-2-2016

$Txt_method:=$2

If (Macintosh option down:C545 | Windows Alt down:C563)

METHOD GET CODE:C1190($Txt_method;$Txt_buffer;1;*)
METHOD GET CODE:C1190($Txt_method; $Txt_buffer; 1; *)

Else

METHOD GET CODE:C1190($Txt_method;$Txt_buffer;*)
METHOD GET CODE:C1190($Txt_method; $Txt_buffer; *)

End if

$Txt_:=Select document:C905(8858;"com.4d.4d.method";"";File name entry:K24:17+Package open:K24:8+Use sheet window:K24:11)
$Txt_:=Select document:C905(8858; "com.4d.4d.method"; ""; File name entry:K24:17+Package open:K24:8+Use sheet window:K24:11)

If (OK=1)

METHOD RESOLVE PATH:C1165($Txt_method;$Lon_type;$Ptr_;$Txt_;$Txt_;*)
METHOD RESOLVE PATH:C1165($Txt_method; $Lon_type; $Ptr_; $Txt_; $Txt_; *)

If ($Lon_type=Path project method:K72:1)

Expand All @@ -70,31 +72,30 @@ Case of

End if

TEXT TO DOCUMENT:C1237($Txt_target;$Txt_buffer)
TEXT TO DOCUMENT:C1237($Txt_target; $Txt_buffer)

End if
End if

//________________________________________
//http://forums.4d.fr/Post/FR/13536439/1/13536440#13536440
//________________________________________
//________________________________________
//http://forums.4d.fr/Post/FR/13536439/1/13536440#13536440
//________________________________________
: ($Txt_entryPoint="new")\
& ($Lon_parameters>=2) // #21-10-2013

$Txt_target:=$2

ARRAY TEXT:C222($tTxt_methods;0x0000)
METHOD GET NAMES:C1166($tTxt_methods;*)
METHOD GET NAMES:C1166($tTxt_methods; *)

$Txt_buffer:=Replace string:C233(Get localized string:C991("methodN");"{count}";String:C10(Size of array:C274($tTxt_methods)))
$Txt_buffer:=Replace string:C233(Get localized string:C991("methodN"); "{count}"; String:C10(Size of array:C274($tTxt_methods)))

Repeat

$Txt_buffer:=Request:C163(Get localized string:C991("methodName");$Txt_buffer;Get localized string:C991("CommonCreate"))
$Txt_buffer:=Request:C163(Get localized string:C991("methodName"); $Txt_buffer; Get localized string:C991("CommonCreate"))

If (OK=1)

If (Find in array:C230($tTxt_methods;$Txt_buffer)>0)
If (Find in array:C230($tTxt_methods; $Txt_buffer)>0)

ALERT:C41(Get localized string:C991("error_AlreadyMethodeWithThatName"))

Expand All @@ -111,47 +112,46 @@ Case of

If (OK=1)

SET MACRO PARAMETER:C998(Highlighted method text:K5:18;$Txt_buffer)
SET MACRO PARAMETER:C998(Highlighted method text:K5:18; $Txt_buffer)

METHOD SET CODE:C1194($Txt_buffer;$Txt_target;*)
METHOD OPEN PATH:C1213($Txt_buffer;*)
METHOD SET CODE:C1194($Txt_buffer; $Txt_target; *)
METHOD OPEN PATH:C1213($Txt_buffer; *)

End if

//________________________________________
//________________________________________
: ($Txt_entryPoint="list")

ARRAY TEXT:C222($tTxt_methods;0x0000)
METHOD GET NAMES:C1166($tTxt_methods;*)
METHOD GET NAMES:C1166($tTxt_methods; *)
SORT ARRAY:C229($tTxt_methods)

$Mnu_main:=Create menu:C408

For ($Lon_i;1;Size of array:C274($tTxt_methods);1)
For ($Lon_i; 1; Size of array:C274($tTxt_methods); 1)

$Lon_x:=Position:C15(".";$tTxt_methods{$Lon_i})
$Lon_x:=Choose:C955($Lon_x=0;Position:C15("_";$tTxt_methods{$Lon_i});$Lon_x)
$Lon_x:=Position:C15("."; $tTxt_methods{$Lon_i})
$Lon_x:=Choose:C955($Lon_x=0; Position:C15("_"; $tTxt_methods{$Lon_i}); $Lon_x)

If ($Lon_x>0)

$Txt_tag:=Substring:C12($tTxt_methods{$Lon_i};1;$Lon_x-1)
$Txt_tag:=Substring:C12($tTxt_methods{$Lon_i}; 1; $Lon_x-1)

If ($Txt_tag#$tTxt_methods{0})

$tTxt_methods{0}:=$Txt_tag

$Mnu_module:=Create menu:C408
APPEND MENU ITEM:C411($Mnu_main;$Txt_tag;$Mnu_module)
APPEND MENU ITEM:C411($Mnu_main; $Txt_tag; $Mnu_module)

End if

APPEND MENU ITEM:C411($Mnu_module;$tTxt_methods{$Lon_i})
SET MENU ITEM PARAMETER:C1004($Mnu_module;-1;$tTxt_methods{$Lon_i})
APPEND MENU ITEM:C411($Mnu_module; $tTxt_methods{$Lon_i})
SET MENU ITEM PARAMETER:C1004($Mnu_module; -1; $tTxt_methods{$Lon_i})

Else

APPEND MENU ITEM:C411($Mnu_main;$tTxt_methods{$Lon_i})
SET MENU ITEM PARAMETER:C1004($Mnu_main;-1;$tTxt_methods{$Lon_i})
APPEND MENU ITEM:C411($Mnu_main; $tTxt_methods{$Lon_i})
SET MENU ITEM PARAMETER:C1004($Mnu_main; -1; $tTxt_methods{$Lon_i})

End if
End for
Expand All @@ -161,76 +161,76 @@ Case of

If (Length:C16($Txt_method)>0)

SET MACRO PARAMETER:C998(Highlighted method text:K5:18;$Txt_method)
SET MACRO PARAMETER:C998(Highlighted method text:K5:18; $Txt_method)

End if

//________________________________________
//________________________________________
: ($Txt_entryPoint="attributes")\
& ($Lon_parameters>=2)

$Txt_target:=$2

$Mnu_main:=Create menu:C408

APPEND MENU ITEM:C411($Mnu_main;Get localized string:C991("Proc_info_invisible"))
SET MENU ITEM PARAMETER:C1004($Mnu_main;-1;String:C10(Attribute invisible:K72:6))
SET MENU ITEM MARK:C208($Mnu_main;-1;\
Choose:C955(METHOD Get attribute:C1169($Txt_target;Attribute invisible:K72:6;*);Char:C90(18);""))
APPEND MENU ITEM:C411($Mnu_main; Get localized string:C991("Proc_info_invisible"))
SET MENU ITEM PARAMETER:C1004($Mnu_main; -1; String:C10(Attribute invisible:K72:6))
SET MENU ITEM MARK:C208($Mnu_main; -1; \
Choose:C955(METHOD Get attribute:C1169($Txt_target; Attribute invisible:K72:6; *); Char:C90(18); ""))

APPEND MENU ITEM:C411($Mnu_main;Get localized string:C991("Proc_info_availableThrough4dHtml"))
SET MENU ITEM PARAMETER:C1004($Mnu_main;-1;String:C10(Attribute published Web:K72:7))
SET MENU ITEM MARK:C208($Mnu_main;-1;\
Choose:C955(METHOD Get attribute:C1169($Txt_target;Attribute published Web:K72:7;*);Char:C90(18);""))
APPEND MENU ITEM:C411($Mnu_main; Get localized string:C991("Proc_info_availableThrough4dHtml"))
SET MENU ITEM PARAMETER:C1004($Mnu_main; -1; String:C10(Attribute published Web:K72:7))
SET MENU ITEM MARK:C208($Mnu_main; -1; \
Choose:C955(METHOD Get attribute:C1169($Txt_target; Attribute published Web:K72:7; *); Char:C90(18); ""))

APPEND MENU ITEM:C411($Mnu_main;Get localized string:C991("Proc_info_offeredAsAWebService"))
SET MENU ITEM PARAMETER:C1004($Mnu_main;-1;String:C10(Attribute published SOAP:K72:8))
$Boo_checked:=METHOD Get attribute:C1169($Txt_target;Attribute published SOAP:K72:8;*)
SET MENU ITEM MARK:C208($Mnu_main;-1;\
Choose:C955($Boo_checked;Char:C90(18);""))
APPEND MENU ITEM:C411($Mnu_main; Get localized string:C991("Proc_info_offeredAsAWebService"))
SET MENU ITEM PARAMETER:C1004($Mnu_main; -1; String:C10(Attribute published SOAP:K72:8))
$Boo_checked:=METHOD Get attribute:C1169($Txt_target; Attribute published SOAP:K72:8; *)
SET MENU ITEM MARK:C208($Mnu_main; -1; \
Choose:C955($Boo_checked; Char:C90(18); ""))

APPEND MENU ITEM:C411($Mnu_main;Get localized string:C991("Proc_info_publishedInWsdl"))
SET MENU ITEM PARAMETER:C1004($Mnu_main;-1;String:C10(Attribute published WSDL:K72:9))
SET MENU ITEM MARK:C208($Mnu_main;-1;\
Choose:C955(METHOD Get attribute:C1169($Txt_target;Attribute published WSDL:K72:9;*);Char:C90(18);""))
APPEND MENU ITEM:C411($Mnu_main; Get localized string:C991("Proc_info_publishedInWsdl"))
SET MENU ITEM PARAMETER:C1004($Mnu_main; -1; String:C10(Attribute published WSDL:K72:9))
SET MENU ITEM MARK:C208($Mnu_main; -1; \
Choose:C955(METHOD Get attribute:C1169($Txt_target; Attribute published WSDL:K72:9; *); Char:C90(18); ""))

If (Not:C34($Boo_checked))

DISABLE MENU ITEM:C150($Mnu_main;-1)
DISABLE MENU ITEM:C150($Mnu_main; -1)

End if

APPEND MENU ITEM:C411($Mnu_main;Get localized string:C991("Proc_info_sharedByComponentsAndHostDatabase"))
SET MENU ITEM PARAMETER:C1004($Mnu_main;-1;String:C10(Attribute shared:K72:10))
SET MENU ITEM MARK:C208($Mnu_main;-1;\
Choose:C955(METHOD Get attribute:C1169($Txt_target;Attribute shared:K72:10;*);Char:C90(18);""))
APPEND MENU ITEM:C411($Mnu_main; Get localized string:C991("Proc_info_sharedByComponentsAndHostDatabase"))
SET MENU ITEM PARAMETER:C1004($Mnu_main; -1; String:C10(Attribute shared:K72:10))
SET MENU ITEM MARK:C208($Mnu_main; -1; \
Choose:C955(METHOD Get attribute:C1169($Txt_target; Attribute shared:K72:10; *); Char:C90(18); ""))

APPEND MENU ITEM:C411($Mnu_main;Get localized string:C991("Proc_info_availableThroughSql"))
SET MENU ITEM PARAMETER:C1004($Mnu_main;-1;String:C10(Attribute published SQL:K72:11))
SET MENU ITEM MARK:C208($Mnu_main;-1;\
Choose:C955(METHOD Get attribute:C1169($Txt_target;Attribute published SQL:K72:11;*);Char:C90(18);""))
APPEND MENU ITEM:C411($Mnu_main; Get localized string:C991("Proc_info_availableThroughSql"))
SET MENU ITEM PARAMETER:C1004($Mnu_main; -1; String:C10(Attribute published SQL:K72:11))
SET MENU ITEM MARK:C208($Mnu_main; -1; \
Choose:C955(METHOD Get attribute:C1169($Txt_target; Attribute published SQL:K72:11; *); Char:C90(18); ""))

APPEND MENU ITEM:C411($Mnu_main;Get localized string:C991("Proc_info_executeOnServer"))
SET MENU ITEM PARAMETER:C1004($Mnu_main;-1;String:C10(Attribute executed on server:K72:12))
SET MENU ITEM MARK:C208($Mnu_main;-1;\
Choose:C955(METHOD Get attribute:C1169($Txt_target;Attribute executed on server:K72:12;*);Char:C90(18);""))
APPEND MENU ITEM:C411($Mnu_main; Get localized string:C991("Proc_info_executeOnServer"))
SET MENU ITEM PARAMETER:C1004($Mnu_main; -1; String:C10(Attribute executed on server:K72:12))
SET MENU ITEM MARK:C208($Mnu_main; -1; \
Choose:C955(METHOD Get attribute:C1169($Txt_target; Attribute executed on server:K72:12; *); Char:C90(18); ""))

$Lon_choice:=Num:C11(Dynamic pop up menu:C1006($Mnu_main))

If ($Lon_choice#0)

METHOD SET ATTRIBUTE:C1192($Txt_target;$Lon_choice;\
Not:C34(METHOD Get attribute:C1169($Txt_target;$Lon_choice;*));*)
METHOD SET ATTRIBUTE:C1192($Txt_target; $Lon_choice; \
Not:C34(METHOD Get attribute:C1169($Txt_target; $Lon_choice; *)); *)

End if

//________________________________________
//________________________________________
Else

ASSERT:C1129(False:C215;"Unknown entry Point: \""+$Txt_entryPoint+"\"")
ASSERT:C1129(False:C215; "Unknown entry Point: \""+$Txt_entryPoint+"\"")

//________________________________________
//________________________________________
End case

// ----------------------------------------------------
// End
// ----------------------------------------------------
// End
3 changes: 0 additions & 3 deletions Project/Sources/Methods/macro.4dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,6 @@ Else

If ($o.success)

ARRAY LONGINT:C221($tLon_positions; 0x0000)
ARRAY LONGINT:C221($tLon_lengths; 0x0000)

If (Match regex:C1019(Choose:C955(Command name:C538(1)="Sum"; "If"; "Si")+"\\s*\\(([^\\)]*)\\).*"; $c[0]; 1; $tLon_positions; $tLon_lengths))

$l:=Position:C15(":="; $c[1])
Expand Down
2 changes: 1 addition & 1 deletion Project/Sources/catalog.4DCatalog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE base SYSTEM "http://www.4d.com/dtd/2007/base.dtd" >
<base name="4DPop Macros" uuid="D58939E725F24AE48BEFA440CBD5F259" collation_locale="fr">
<schema name="DEFAULT_SCHEMA"/>
<base_extra data_file_path=":4DPop Macros.4DD" package_name="4DPop Macros" structure_file_name="4DPop Macros" ppc_code_stamp="1958" __stringCompHash="icu:72.1.0" __keywordBuildingHash="icu:72.1.0">
<base_extra data_file_path=":4DPop Macros.4DD" package_name="4DPop Macros" structure_file_name="4DPop Macros" ppc_code_stamp="1958">
<temp_folder folder_selector="data"/>
<journal_file journal_file_enabled="false"/>
</base_extra>
Expand Down

0 comments on commit 4be5f59

Please sign in to comment.