From 9a10c5aea8c347a965f34e204f1749f86169db01 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Wed, 25 Apr 2012 18:14:29 +0000 Subject: [PATCH] * don't mark final class methods as virtual git-svn-id: branches/jvmbackend@21040 - --- utils/javapp/src/fpc/tools/javapp/PascalMethodData.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/javapp/src/fpc/tools/javapp/PascalMethodData.java b/utils/javapp/src/fpc/tools/javapp/PascalMethodData.java index 92d4a96d6b..aba664907c 100644 --- a/utils/javapp/src/fpc/tools/javapp/PascalMethodData.java +++ b/utils/javapp/src/fpc/tools/javapp/PascalMethodData.java @@ -26,7 +26,11 @@ public class PascalMethodData extends MethodData { * Return modifiers of the method that matter to Pascal import. */ public String getModifiers(){ - if ((access & ACC_FINAL) !=0) return " virtual; final;"; + if ((access & ACC_FINAL) !=0) + if (!isStatic()) + return " virtual; final;"; + else + return " final;"; if ((access & ACC_ABSTRACT) !=0) return " virtual; abstract;"; if (!isStatic()) return " virtual;"; return "";