codetools: target jvm: default class ancestor is jlobject

git-svn-id: trunk@34564 -

components/codetools/codetoolsstrconsts.pas

@@ -136,6 +136,11 @@ ResourceString
   ctsDefaultClassAncestorTObjectNotFound = 'default class ancestor TObject not found';
   ctsDefaultInterfaceAncestorIInterfaceNotFound =
     'default interface ancestor IInterface not found';
+  ctsDefaultDispinterfaceAncestorIDispatchNotFound = 'default dispinterface '
+    +'ancestor IDispatch not found';
+  ctsDefaultJavaClassAncestorJLObjectNotFound = 'default java class ancestor '
+    +'JLObject not found';
+  ctsDefaultAncestorNotFound = 'default ancestor %s not found';
   ctsExprTypeMustBeClassOrRecord = 'expression type must be class or record type';
   ctsClassWithoutName = 'class without name';
   ctsBinaryOperator = 'binary operator';

components/codetools/finddeclarationtool.pas

@@ -4147,8 +4147,24 @@ function TFindDeclarationTool.FindDefaultAncestorOfClass(
 var
   OldInput: TFindDeclarationInput;
   AncestorNode, ClassIdentNode: TCodeTreeNode;
-  SearchBaseClass: boolean;
   AncestorContext: TFindContext;
+  BaseClassName: PChar;
+
+  procedure RaiseBaseClassNotFound;
+  begin
+    MoveCursorToNodeStart(ClassNode);
+    if BaseClassName='TObject' then
+      RaiseException(ctsDefaultClassAncestorTObjectNotFound)
+    else if BaseClassName='IInterface' then
+      RaiseException(ctsDefaultInterfaceAncestorIInterfaceNotFound)
+    else if BaseClassName='IDispatch' then
+      RaiseException(ctsDefaultDispinterfaceAncestorIDispatchNotFound)
+    else if BaseClassName='JLObject' then
+      RaiseException(ctsDefaultJavaClassAncestorJLObjectNotFound)
+    else
+      RaiseException(Format(ctsDefaultAncestorNotFound, [BaseClassName]))
+  end;
+
 begin
   {$IFDEF CheckNodeTool}CheckNodeTool(ClassNode);{$ENDIF}
   if (ClassNode=nil) or (not (ClassNode.Desc in AllClasses))
@@ -4167,62 +4183,44 @@ begin
   begin
     ClassIdentNode:=nil;
   end;
+  if ClassIdentNode<>nil then exit;
+  BaseClassName:=nil;
   if ClassNode.Desc=ctnClass then begin
-    // if this class is not TObject, TObject is class ancestor
+    if Scanner.Values.IsDefined('CPUJVM') then
-    SearchBaseClass:=(ClassIdentNode=nil)
+      BaseClassName:='JLObject'
-              or (not CompareSrcIdentifiers(ClassIdentNode.StartPos,'TObject'));
+    else
+      BaseClassName:='TObject';
   end else if ClassNode.Desc=ctnDispinterface then begin
     // default interface is IDispatch
-    SearchBaseClass:=(ClassIdentNode=nil)
+    BaseClassName:='IDispatch';
-            or (not CompareSrcIdentifiers(ClassIdentNode.StartPos,'IDispatch'));
   end else if ClassNode.Desc in AllClassInterfaces then begin
     // Delphi has as default interface IInterface
     // FPC has as default interface IUnknown and an alias IInterface = IUnknown
-    SearchBaseClass:=(ClassIdentNode=nil)
+    if CompareSrcIdentifiers(ClassIdentNode.StartPos,'IUnknown') then exit;
-         or   ((not CompareSrcIdentifiers(ClassIdentNode.StartPos,'IInterface'))
+    BaseClassName:='IInterface';
-           and (not CompareSrcIdentifiers(ClassIdentNode.StartPos,'IUnknown')));
   end else
     exit; // has no default ancestor (e.g. record)
-  if not SearchBaseClass then exit;
+  if CompareSrcIdentifiers(ClassIdentNode.StartPos,BaseClassName) then exit;
 
   {$IFDEF ShowTriedContexts}
   DebugLn('[TFindDeclarationTool.FindAncestorOfClass] ',
-  ' search default ancestor class');
+  ' search default ancestor class '+BaseClassName);
   {$ENDIF}
 
-  // search ancestor
+  // search default ancestor
   Params.Save(OldInput);
   Params.Flags:=[fdfSearchInParentNodes,fdfIgnoreCurContextNode,
                  fdfExceptionOnNotFound]
                 +(fdfGlobals*Params.Flags)
                 -[fdfTopLvlResolving];
-  if ClassNode.Desc=ctnClass then
+  Params.SetIdentifier(Self,BaseClassName,nil);
-    Params.SetIdentifier(Self,'TObject',nil)
-  else if ClassNode.Desc=ctnClassInterface then
-    Params.SetIdentifier(Self,'IInterface',nil)
-  else if ClassNode.Desc=ctnDispinterface then
-    Params.SetIdentifier(Self,'IDispatch',nil)
-  else
-    exit;
   Params.ContextNode:=ClassNode;
-  if not FindIdentifierInContext(Params) then begin
+  if not FindIdentifierInContext(Params) then
-    MoveCursorToNodeStart(ClassNode);
+    RaiseBaseClassNotFound;
-    if ClassNode.Desc=ctnClass then
-      RaiseException(ctsDefaultClassAncestorTObjectNotFound)
-    else
-      RaiseException(ctsDefaultInterfaceAncestorIInterfaceNotFound);
-    exit;
-  end;
 
   // check result
   if not (Params.NewNode.Desc in [ctnTypeDefinition,ctnGenericType]) then
-  begin
+    RaiseBaseClassNotFound;
-    MoveCursorToNodeStart(ClassNode);
-    if ClassNode.Desc=ctnClass then
-      RaiseException(ctsDefaultClassAncestorTObjectNotFound)
-    else
-      RaiseException(ctsDefaultInterfaceAncestorIInterfaceNotFound);
-  end;
 
   // search ancestor class context
   if FindClassContext then begin
@@ -4234,13 +4232,8 @@ begin
 
     // check result
     if not (Params.NewNode.Desc in [ctnClass,ctnClassInterface])
-    then begin
+    then
-      MoveCursorToNodeStart(ClassNode);
+      RaiseBaseClassNotFound;
-      if ClassNode.Desc=ctnClass then
-        RaiseException(ctsDefaultClassAncestorTObjectNotFound)
-      else
-        RaiseException(ctsDefaultInterfaceAncestorIInterfaceNotFound);
-    end;
   end;
   Result:=true;
   Params.Load(OldInput,true);

components/codetools/languages/codetoolsstrconsts.ca.po

@@ -153,10 +153,18 @@ msgstr "Directori dels components personalitzats"
 msgid "Debugger Directory"
 msgstr "Directori del depurador"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "no s'ha trobat la classe predeterminada progenitora TObject"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr ""
@@ -181,6 +189,10 @@ msgstr ""
 msgid "default interface ancestor IInterface not found"
 msgstr "no s'ha trobat l'interfície predeterminada progenitora IInterface"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "s'esperava un paràmetre predeterminat, però s'ha trobat %s"

components/codetools/languages/codetoolsstrconsts.cs.po

@@ -154,10 +154,18 @@ msgstr "Adresář vlastních komponent"
 msgid "Debugger Directory"
 msgstr "Adresář Ladiče"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "nenalezen výchozí předek třídy TObject"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr "Výchozí zdrojový Operační systém 2 fpc "
@@ -182,6 +190,10 @@ msgstr "Výchozí cílový procesor fpc"
 msgid "default interface ancestor IInterface not found"
 msgstr "Nenalezen výchozí předek rozhraní IInterface"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "očekáván výchozí parametr, ale nalezeno %s"

components/codetools/languages/codetoolsstrconsts.de.po

@@ -156,10 +156,18 @@ msgstr "Benutzerdefiniertes Komponentenverzeichnis"
 msgid "Debugger Directory"
 msgstr "Debugger-Verzeichnis"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "Default-Klassenvorfahr TObject nicht gefunden"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr ""
@@ -184,6 +192,10 @@ msgstr "Vorgabe-FPC-Zielprozessor"
 msgid "default interface ancestor IInterface not found"
 msgstr "Default-Interfacevorfahr IInterface nicht gefunden"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "Default-Parameter erwartet aber %s gefunden"

components/codetools/languages/codetoolsstrconsts.es.po

@@ -153,10 +153,18 @@ msgstr "Directorio de los Componentes personalizados"
 msgid "Debugger Directory"
 msgstr "Directorio del Depurador"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "clase ancestro por defecto TObject no encontrada"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr ""
@@ -181,6 +189,10 @@ msgstr ""
 msgid "default interface ancestor IInterface not found"
 msgstr "interface ancestro por defecto IInterface no encontrada"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "se esperaba parámetro por defecto, pero se encontró %s"

components/codetools/languages/codetoolsstrconsts.fi.po

@@ -148,10 +148,18 @@ msgstr ""
 msgid "Debugger Directory"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr ""
@@ -176,6 +184,10 @@ msgstr ""
 msgid "default interface ancestor IInterface not found"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr ""

components/codetools/languages/codetoolsstrconsts.fr.po

@@ -154,10 +154,18 @@ msgstr "Répertoire des composants personalisés"
 msgid "Debugger Directory"
 msgstr "Répertoire débogueur"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "ancêtre de classe par défaut (TObject) non trouvé"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr ""
@@ -182,6 +190,10 @@ msgstr ""
 msgid "default interface ancestor IInterface not found"
 msgstr "Ancêtre par défaut de IInterface non trouvée"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "paramètre default attendu, mais %s trouvé"

components/codetools/languages/codetoolsstrconsts.he.po

@@ -153,10 +153,18 @@ msgstr "תיקיית הרכיבים מותאמת אישית"
 msgid "Debugger Directory"
 msgstr "תיקיית מנפה השגיאות"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "אכ ברירת המחדל TObject לא נמצא"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr "מערכת ההפעלה שהיא מקור ברירת המחדל השניה של fpc"
@@ -181,6 +189,10 @@ msgstr "המעבד שהוא יעד ברירת המחדל של fpc"
 msgid "default interface ancestor IInterface not found"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "צפוי פרמטר ברירת המחדל, אבל נמצא s%"

components/codetools/languages/codetoolsstrconsts.id.po

@@ -154,10 +154,18 @@ msgstr "Direktori Komponen Kustom"
 msgid "Debugger Directory"
 msgstr "Direktori Debugger"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "karuhun class default TObject tidak ditemukan"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr ""
@@ -182,6 +190,10 @@ msgstr ""
 msgid "default interface ancestor IInterface not found"
 msgstr "karuhun interface default IInterface tidak ditemukan"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "parameter default diharapkan, tapi %s yang ditemukan"

components/codetools/languages/codetoolsstrconsts.it.po

@@ -151,10 +151,18 @@ msgstr "Cartella componenti personalizzati"
 msgid "Debugger Directory"
 msgstr "Cartella del debugger"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "antenato di classe default TObject non trovato"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr "Sorgenti fpc di default sistema operativo 2"
@@ -179,6 +187,10 @@ msgstr "Processore di destinazione FPC di default"
 msgid "default interface ancestor IInterface not found"
 msgstr "antenato di interfaccia di default IInterface non trovato"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "era previsto un parametro di default, invece c'è %s"

components/codetools/languages/codetoolsstrconsts.lt.po

@@ -155,10 +155,18 @@ msgstr "Naudotojo komponenčių aplankas"
 msgid "Debugger Directory"
 msgstr "Derintuvės aplankas"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "nerastas klasės protėvis TObject"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr ""
@@ -183,6 +191,10 @@ msgstr ""
 msgid "default interface ancestor IInterface not found"
 msgstr "nerastas interfeiso protėvis IInterface"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "tikėtasi numatyto parametro, tačiau aptikta %s"

components/codetools/languages/codetoolsstrconsts.nl.po

@@ -153,10 +153,18 @@ msgstr ""
 msgid "Debugger Directory"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr ""
@@ -181,6 +189,10 @@ msgstr ""
 msgid "default interface ancestor IInterface not found"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr ""

components/codetools/languages/codetoolsstrconsts.pl.po

@@ -157,10 +157,18 @@ msgstr "Katalog komponentów użytkownika"
 msgid "Debugger Directory"
 msgstr "Katalog odpluskwiacza"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "nie znaleziono domyślnego przodka klasy: TObject"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr ""
@@ -185,6 +193,10 @@ msgstr ""
 msgid "default interface ancestor IInterface not found"
 msgstr "nie znaleziono domyślnego przodka interfejsu: IInterface"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "zamiast domyślnego parametru znaleziono %s"

components/codetools/languages/codetoolsstrconsts.po

@@ -148,10 +148,18 @@ msgstr ""
 msgid "Debugger Directory"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr ""
@@ -176,6 +184,10 @@ msgstr ""
 msgid "default interface ancestor IInterface not found"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr ""

components/codetools/languages/codetoolsstrconsts.pt.po

@@ -153,10 +153,18 @@ msgstr "Diretório Componentes Personalizados"
 msgid "Debugger Directory"
 msgstr "Diretório Depurador"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "classe ancestral padrão \"TObject\" não encontrada"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr "Sistema Operacional 2 fonte fpc padrão"
@@ -181,6 +189,10 @@ msgstr "Processador alvo fpc padrão"
 msgid "default interface ancestor IInterface not found"
 msgstr "interface ancestral padrão \"IInterface\" não encontrada"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "parâmetro padrão esperado, mas %s encontrado"

components/codetools/languages/codetoolsstrconsts.pt_BR.po

@@ -153,10 +153,18 @@ msgstr "Diretório Componentes Personalizados"
 msgid "Debugger Directory"
 msgstr "Diretório Depurador"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "classe ancestral padrão \"TObject\" não encontrada"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr "Sistema Operacional 2 fonte fpc padrão"
@@ -181,6 +189,10 @@ msgstr "Processador alvo fpc padrão"
 msgid "default interface ancestor IInterface not found"
 msgstr "interface ancestral padrão \"IInterface\" não encontrada"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "parâmetro padrão esperado, mas %s encontrado"

components/codetools/languages/codetoolsstrconsts.ru.po

@@ -153,10 +153,18 @@ msgstr "Каталог компонентов пользователя"
 msgid "Debugger Directory"
 msgstr "Каталог отладчика"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "класс-предок по умолчанию - TObject - не найден"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr "Исходная операционная система 2 для fpc по умолчанию"
@@ -181,6 +189,10 @@ msgstr "Целевой процессор для fpc по умолчанию"
 msgid "default interface ancestor IInterface not found"
 msgstr "интерфейс-предок по умолчанию - IInterface - не найден"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "ожидается параметр по умолчанию, найдено %s"

components/codetools/languages/codetoolsstrconsts.sk.po

@@ -154,10 +154,18 @@ msgstr ""
 msgid "Debugger Directory"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr ""
@@ -182,6 +190,10 @@ msgstr ""
 msgid "default interface ancestor IInterface not found"
 msgstr ""
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr ""

components/codetools/languages/codetoolsstrconsts.uk.po

@@ -153,10 +153,18 @@ msgstr "Спеціальна тека компонетів"
 msgid "Debugger Directory"
 msgstr "Тека налагоджувача"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "не знайдений клас-предок за замовчуванням TObject"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr "Типова Операційна Система вихідного коду fpc 2"
@@ -181,6 +189,10 @@ msgstr "Цільовий процесор fpc за зомовчуванням"
 msgid "default interface ancestor IInterface not found"
 msgstr "не знайдений інтерфейс-предок за замовчуванням IInterface"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "очікується параметр за замовчуванням, але знайдено %s"

components/codetools/languages/codetoolsstrconsts.zh_CN.po

@@ -156,10 +156,18 @@ msgstr "配置自定义组件"
 msgid "Debugger Directory"
 msgstr "调试器目录"
 
+#: codetoolsstrconsts.ctsdefaultancestornotfound
+msgid "default ancestor %s not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultclassancestortobjectnotfound
 msgid "default class ancestor TObject not found"
 msgstr "默认类TObject的父类未找到"
 
+#: codetoolsstrconsts.ctsdefaultdispinterfaceancestoridispatchnotfound
+msgid "default dispinterface ancestor IDispatch not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultfpcsource2operatingsystem
 msgid "Default fpc source Operating System 2"
 msgstr ""
@@ -184,6 +192,10 @@ msgstr ""
 msgid "default interface ancestor IInterface not found"
 msgstr "默认接口IInterface的父类未找到"
 
+#: codetoolsstrconsts.ctsdefaultjavaclassancestorjlobjectnotfound
+msgid "default java class ancestor JLObject not found"
+msgstr ""
+
 #: codetoolsstrconsts.ctsdefaultparameterexpectedbutatomfound
 msgid "default parameter expected, but %s found"
 msgstr "本应是默认的参数, 但是 %s 出现"

components/codetools/pascalparsertool.pas

@@ -444,7 +444,7 @@ begin
   'F':
     case UpChars[p[1]] of
     'U': if CompareSrcIdentifiers(p,'FUNCTION') then exit(KeyWordFuncClassMethod);
-    'I': if CompareSrcIdentifiers(p,'FINAL') and (Scanner.Values.IsDefined('CPUJVM'))
+    'I': if CompareSrcIdentifiers(p,'FINAL') and Scanner.Values.IsDefined('CPUJVM')
          then exit(KeyWordFuncClassFinal);
     end;
   'P':