From 2e7fa04712083ed0cf1212b1a436f45fc356def5 Mon Sep 17 00:00:00 2001
From: inoussa <inoussa@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 15 Oct 2010 13:43:44 +0000
Subject: [PATCH] Replace property "store" prefix by sWST_PROP_STORE_PREFIX( =
 'wstHas_') (fix)

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1350 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 wst/trunk/ws_helper/generator.pas     | 6 +++---
 wst/trunk/ws_helper/ws_parser_imp.pas | 2 +-
 wst/trunk/ws_helper/xsd_generator.pas | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/wst/trunk/ws_helper/generator.pas b/wst/trunk/ws_helper/generator.pas
index 54b529e82..434f2423d 100644
--- a/wst/trunk/ws_helper/generator.pas
+++ b/wst/trunk/ws_helper/generator.pas
@@ -2360,7 +2360,7 @@ var
           Inc(locClassPropNbr);
         if SymbolTable.IsOfType(p.VarType,TPasArrayType) then
           Inc(locArrayPropsNbr);
-        if AnsiSameText(sWST_PROP_STORE_PREFIX,Copy(p.StoredAccessorName,1,3))  then
+        if AnsiSameText(sWST_PROP_STORE_PREFIX,Copy(p.StoredAccessorName,1,Length(sWST_PROP_STORE_PREFIX)))  then
           Inc(locOptionalPropsNbr);
       end;
     end;
@@ -2464,7 +2464,7 @@ var
         IncIndent();
           for k := 0 to Pred(locPropCount) do begin
             p := TPasProperty(locPropList[k]);
-            if AnsiSameText(sWST_PROP_STORE_PREFIX,Copy(p.StoredAccessorName,1,3)) then begin
+            if AnsiSameText(sWST_PROP_STORE_PREFIX,Copy(p.StoredAccessorName,1,Length(sWST_PROP_STORE_PREFIX))) then begin
               Indent();
               WriteLn('function %s() : Boolean;',[p.StoredAccessorName]);
             end;
@@ -2550,7 +2550,7 @@ var
     end;
     for k := 0 to Pred(locPropCount) do begin
       p := TPasProperty(locPropList[k]);
-      if AnsiSameText(sWST_PROP_STORE_PREFIX,Copy(p.StoredAccessorName,1,3)) then begin
+      if AnsiSameText(sWST_PROP_STORE_PREFIX,Copy(p.StoredAccessorName,1,Length(sWST_PROP_STORE_PREFIX))) then begin
         NewLine();
         WriteLn('function %s.%s() : Boolean;',[ASymbol.Name,p.StoredAccessorName]);
         WriteLn('begin');
diff --git a/wst/trunk/ws_helper/ws_parser_imp.pas b/wst/trunk/ws_helper/ws_parser_imp.pas
index 2edbf7db5..d8d91f224 100644
--- a/wst/trunk/ws_helper/ws_parser_imp.pas
+++ b/wst/trunk/ws_helper/ws_parser_imp.pas
@@ -1190,7 +1190,7 @@ begin
               end;
               if AnsiSameText(propTyp.StoredAccessorName,'False') then
                 locStrBuffer := s_prohibited
-              else if AnsiSameText(Copy(propTyp.StoredAccessorName,1,3),sWST_PROP_STORE_PREFIX) then
+              else if AnsiSameText(Copy(propTyp.StoredAccessorName,1,Length(sWST_PROP_STORE_PREFIX)),sWST_PROP_STORE_PREFIX) then
                 locStrBuffer := s_optional
               else
                 locStrBuffer := s_required;
diff --git a/wst/trunk/ws_helper/xsd_generator.pas b/wst/trunk/ws_helper/xsd_generator.pas
index c6622f3f8..9c2f3396f 100644
--- a/wst/trunk/ws_helper/xsd_generator.pas
+++ b/wst/trunk/ws_helper/xsd_generator.pas
@@ -897,7 +897,9 @@ var
     typeHelper : IXsdSpecialTypeHelper;
   begin
     p := AProp;
-    if AnsiSameText('Has',Copy(p.StoredAccessorName,1,3)) or AnsiSameText('True',p.StoredAccessorName) then begin
+    if AnsiSameText(sWST_PROP_STORE_PREFIX,Copy(p.StoredAccessorName,1,Length(sWST_PROP_STORE_PREFIX))) or 
+       AnsiSameText('True',p.StoredAccessorName) 
+    then begin
       if AContainer.IsAttributeProperty(p) then begin
         s := Format('%s:%s',[s_xs_short,s_attribute]);
         if Assigned(derivationNode) then
@@ -943,13 +945,13 @@ var
         if ( Length(p.DefaultValue) > 0 ) then
           propNode.SetAttribute(s_default,p.DefaultValue);
         if AContainer.IsAttributeProperty(p) then begin
-          if AnsiSameText('Has',Copy(p.StoredAccessorName,1,3)) then begin
+          if AnsiSameText(sWST_PROP_STORE_PREFIX,Copy(p.StoredAccessorName,1,Length(sWST_PROP_STORE_PREFIX))) then begin
             {propNode.SetAttribute(s_use,'optional')}
           end else begin
             propNode.SetAttribute(s_use,'required');
           end;
         end else begin
-          if AnsiSameText('Has',Copy(p.StoredAccessorName,1,3)) then
+          if AnsiSameText(sWST_PROP_STORE_PREFIX,Copy(p.StoredAccessorName,1,Length(sWST_PROP_STORE_PREFIX))) then
             propNode.SetAttribute(s_minOccurs,'0');
           if isEmbeddedArray then begin
             propNode.SetAttribute(s_maxOccurs,s_unbounded);