diff options
author | Silenio Quarti <silenio> | 2006-07-20 16:31:55 +0000 |
---|---|---|
committer | Silenio Quarti <silenio> | 2006-07-20 16:31:55 +0000 |
commit | a85637b0f04c02a186f7eb1cbfb42a7898cff198 (patch) | |
tree | 727adfa6968f21f16e2b06e162e62ee4f9b65f91 /bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools | |
parent | 4a3f9af5ae6294641a95650d44bc8f9e572af3f1 (diff) | |
download | eclipse.platform.swt-a85637b0f04c02a186f7eb1cbfb42a7898cff198.tar.gz eclipse.platform.swt-a85637b0f04c02a186f7eb1cbfb42a7898cff198.tar.xz eclipse.platform.swt-a85637b0f04c02a186f7eb1cbfb42a7898cff198.zip |
150764 - PATCH] fix compiler warnings for GCC 4.x (sentinel)
Diffstat (limited to 'bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools')
10 files changed, 68 insertions, 43 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ClassData.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ClassData.java index 914b0335fd..05600890b7 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ClassData.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ClassData.java @@ -20,7 +20,7 @@ public ClassData(Class clazz, String str) { } public static String[] getAllFlags() { - return new String[]{"no_gen", "cpp"}; + return new String[]{FLAG_NO_GEN, FLAG_CPP}; } public Class getClazz() { diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/FieldData.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/FieldData.java index 8228856417..47333cf13a 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/FieldData.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/FieldData.java @@ -22,7 +22,7 @@ public FieldData(Field field, String str) { } public static String[] getAllFlags() { - return new String[]{"no_gen", "no_wince"}; + return new String[]{FLAG_NO_GEN, FLAG_NO_WINCE}; } public String getAccessor() { diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/Flags.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/Flags.java new file mode 100644 index 0000000000..eb7149da21 --- /dev/null +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/Flags.java @@ -0,0 +1,21 @@ +package org.eclipse.swt.tools.internal; + +public interface Flags { + + public static final String FLAG_NO_GEN = "no_gen"; + public static final String FLAG_NO_IN = "no_in"; + public static final String FLAG_NO_OUT = "no_out"; + public static final String FLAG_NO_WINCE = "no_wince"; + public static final String FLAG_CRITICAL = "critical"; + public static final String FLAG_INIT = "init"; + public static final String FLAG_STRUCT = "struct"; + public static final String FLAG_UNICODE = "unicode"; + public static final String FLAG_SENTINEL = "sentinel"; + public static final String FLAG_CPP = "cpp"; + public static final String FLAG_NEW = "new"; + public static final String FLAG_DELETE ="delete"; + public static final String FLAG_CONST = "const"; + public static final String FLAG_DYNAMIC = "dynamic"; + public static final String FLAG_JNI = "jni"; + public static final String FLAG_ADDRESS = "address"; +} diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ItemData.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ItemData.java index 4870409e01..19b4c692da 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ItemData.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ItemData.java @@ -17,7 +17,7 @@ import java.util.HashSet; import java.util.Set; import java.util.StringTokenizer; -public abstract class ItemData { +public abstract class ItemData implements Flags { HashMap params; @@ -57,7 +57,7 @@ public Object getParam(String key) { } public boolean getGenerate() { - return !getFlag("no_gen"); + return !getFlag(FLAG_NO_GEN); } public void parse(String str) { @@ -92,7 +92,7 @@ public void setFlag(String flag, boolean value) { } public void setGenerate(boolean value) { - setFlag("no_gen", !value); + setFlag(FLAG_NO_GEN, !value); } public void setParam(String key, Object value) { diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGenerator.java index 5be7b89338..a4f1512748 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGenerator.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGenerator.java @@ -16,7 +16,7 @@ import java.util.*; import org.eclipse.swt.SWT; -public abstract class JNIGenerator { +public abstract class JNIGenerator implements Flags { Class mainClass; Class[] classes; @@ -275,7 +275,7 @@ public void generate() { for (int i = 0; i < classes.length; i++) { Class clazz = classes[i]; ClassData data = getMetaData().getMetaData(clazz); - if (data.getFlag("cpp")) { + if (data.getFlag(FLAG_CPP)) { isCPP = true; break; } @@ -302,7 +302,7 @@ public Class[] getClasses() { protected boolean getGenerate(Class clazz) { ClassData data = getMetaData().getMetaData(clazz); - return !data.getFlag("no_gen"); + return !data.getFlag(FLAG_NO_GEN); } public boolean getCPP() { diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MethodData.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MethodData.java index e02d698179..5d9d308284 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MethodData.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MethodData.java @@ -22,7 +22,7 @@ public MethodData(Method method, String str) { } public static String[] getAllFlags() { - return new String[]{"no_gen", "address", "const", "dynamic", "jni", "cpp", "new", "delete"}; + return new String[]{FLAG_NO_GEN, FLAG_ADDRESS, FLAG_CONST, FLAG_DYNAMIC, FLAG_JNI, FLAG_CPP, FLAG_NEW, FLAG_DELETE}; } public Method getMethod() { diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java index 2f8cd02321..711f3d738a 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java @@ -85,7 +85,7 @@ public void generate(Method[] methods) { public void generate(Method method) { MethodData methodData = getMetaData().getMetaData(method); - if (methodData.getFlag("no_gen")) return; + if (methodData.getFlag(FLAG_NO_GEN)) return; Class returnType = method.getReturnType(); Class[] paramTypes = method.getParameterTypes(); String function = getFunctionName(method); @@ -184,7 +184,7 @@ boolean generateGetParameter(Method method, int i, Class paramType, ParameterDat throw new Error("not done"); } } else if (paramType == String.class) { - if (paramData.getFlag("unicode")) { + if (paramData.getFlag(FLAG_UNICODE)) { if (isCPP) { output("env->GetStringChars(arg"); } else { @@ -202,7 +202,7 @@ boolean generateGetParameter(Method method, int i, Class paramType, ParameterDat output(", NULL)"); } } else { - if (paramData.getFlag("no_in")) { + if (paramData.getFlag(FLAG_NO_IN)) { output("&_arg"); output(iStr); } else { @@ -254,7 +254,7 @@ void generateSetParameter(int i, Class paramType, ParameterData paramData, boole output(", lparg"); output(iStr); output(", "); - if (paramData.getFlag("no_out")) { + if (paramData.getFlag(FLAG_NO_OUT)) { output("JNI_ABORT"); } else { output("0"); @@ -270,7 +270,7 @@ void generateSetParameter(int i, Class paramType, ParameterData paramData, boole output(" && lparg"); output(iStr); output(") "); - if (paramData.getFlag("unicode")) { + if (paramData.getFlag(FLAG_UNICODE)) { if (isCPP) { output("env->ReleaseStringChars(arg"); } else { @@ -288,7 +288,7 @@ void generateSetParameter(int i, Class paramType, ParameterData paramData, boole output(iStr); outputln(");"); } else { - if (!paramData.getFlag("no_out")) { + if (!paramData.getFlag(FLAG_NO_OUT)) { output("\tif (arg"); output(iStr); output(" && lparg"); @@ -340,7 +340,7 @@ boolean generateLocalVars(Method method, Class[] paramTypes, Class returnType) { throw new Error("not done"); } } else if (paramType == String.class) { - if (paramData.getFlag("unicode")) { + if (paramData.getFlag(FLAG_UNICODE)) { output("const jchar *lparg" + i); } else { output("const char *lparg" + i); @@ -349,7 +349,7 @@ boolean generateLocalVars(Method method, Class[] paramTypes, Class returnType) { } else { output(getClassName(paramType)); output(" _arg" + i); - if (paramData.getFlag("init")) output("={0}"); + if (paramData.getFlag(FLAG_INIT)) output("={0}"); output(", *lparg" + i); output("=NULL;"); } @@ -492,7 +492,7 @@ void generateDynamicFunctionCall(Method method, MethodData methodData, Class[] p if (cast.length() > 2) { output(cast.substring(1, cast.length() - 1)); } else { - output(getTypeSignature4(paramType, paramData.getFlag("struct"))); + output(getTypeSignature4(paramType, paramData.getFlag(FLAG_STRUCT))); } } outputln(");"); @@ -532,7 +532,7 @@ void generateDynamicFunctionCall(Method method, MethodData methodData, Class[] p if (cast.length() > 2) { output(cast.substring(1, cast.length() - 1)); } else { - output(getTypeSignature4(paramType, paramData.getFlag("struct"))); + output(getTypeSignature4(paramType, paramData.getFlag(FLAG_STRUCT))); } } outputln(");"); @@ -575,28 +575,32 @@ void generateFunctionCallLeftSide(Method method, MethodData methodData, Class re output(getTypeSignature2(returnType)); output(")"); } - if (methodData.getFlag("address")) { + if (methodData.getFlag(FLAG_ADDRESS)) { output("&"); } - if (methodData.getFlag("jni")) { + if (methodData.getFlag(FLAG_JNI)) { output(isCPP ? "env->" : "(*env)->"); } } void generateFunctionCallRightSide(Method method, MethodData methodData, Class[] paramTypes, int paramStart) { - if (!methodData.getFlag("const")) { + if (!methodData.getFlag(FLAG_CONST)) { output("("); - if (methodData.getFlag("jni")) { + if (methodData.getFlag(FLAG_JNI)) { if (!isCPP) output("env, "); } for (int i = paramStart; i < paramTypes.length; i++) { Class paramType = paramTypes[i]; ParameterData paramData = getMetaData().getMetaData(method, i); if (i != paramStart) output(", "); - if (paramData.getFlag("struct")) output("*"); + if (paramData.getFlag(FLAG_STRUCT)) output("*"); output(paramData.getCast()); - if (!paramType.isPrimitive() && !isSystemClass(paramType)) output("lp"); - output("arg" + i); + if (i == paramTypes.length - 1 && paramData.getFlag(FLAG_SENTINEL)) { + output("NULL"); + } else { + if (!paramType.isPrimitive() && !isSystemClass(paramType)) output("lp"); + output("arg" + i); + } } output(")"); } @@ -642,10 +646,10 @@ void generateFunctionCall(Method method, MethodData methodData, Class[] paramTyp output(getTypeSignature4(paramTypes[1])); output(" **)arg1)[arg0])"); paramStart = 1; - } else if (methodData.getFlag("cpp")) { + } else if (methodData.getFlag(FLAG_CPP)) { output("("); ParameterData paramData = getMetaData().getMetaData(method, 0); - if (paramData.getFlag("struct")) output("*"); + if (paramData.getFlag(FLAG_STRUCT)) output("*"); String cast = paramData.getCast(); if (cast.length() != 0 && !cast.equals("()")) { output(cast); @@ -663,7 +667,7 @@ void generateFunctionCall(Method method, MethodData methodData, Class[] paramTyp } } paramStart = 1; - } else if (methodData.getFlag("new")) { + } else if (methodData.getFlag(FLAG_NEW)) { output("new "); String accessor = methodData.getAccessor(); if (accessor.length() != 0) { @@ -676,7 +680,7 @@ void generateFunctionCall(Method method, MethodData methodData, Class[] paramTyp output(name); } } - } else if (methodData.getFlag("delete")) { + } else if (methodData.getFlag(FLAG_DELETE)) { output("delete "); ParameterData paramData = getMetaData().getMetaData(method, 0); String cast = paramData.getCast(); @@ -749,7 +753,7 @@ void generateFunctionBody(Method method, MethodData methodData, String function, boolean needsReturn = generateLocalVars(method, paramTypes, returnType); generateEnterMacro(method, function); boolean genFailTag = generateGetters(method, paramTypes); - if (methodData.getFlag("dynamic")) { + if (methodData.getFlag(FLAG_DYNAMIC)) { generateDynamicFunctionCall(method, methodData, paramTypes, returnType, needsReturn); } else { generateFunctionCall(method, methodData, paramTypes, returnType, needsReturn); @@ -797,7 +801,7 @@ void generateSourceEnd(String function) { } boolean isCritical(Class paramType, ParameterData paramData) { - return paramType.isArray() && paramType.getComponentType().isPrimitive() && paramData.getFlag("critical"); + return paramType.isArray() && paramType.getComponentType().isPrimitive() && paramData.getFlag(FLAG_CRITICAL); } boolean isSystemClass(Class type) { diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ParameterData.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ParameterData.java index 1268e6782d..277c8b573c 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ParameterData.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ParameterData.java @@ -24,7 +24,7 @@ public ParameterData(Method method, int parameter, String str) { } public static String[] getAllFlags() { - return new String[]{"no_in", "no_out", "critical", "init", "struct", "unicode"}; + return new String[]{FLAG_NO_IN, FLAG_NO_OUT, FLAG_CRITICAL, FLAG_INIT, FLAG_STRUCT, FLAG_UNICODE, FLAG_SENTINEL}; } public String getCast() { diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StructsGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StructsGenerator.java index 52c8a697f4..8685ac1b3a 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StructsGenerator.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StructsGenerator.java @@ -273,7 +273,7 @@ void generateGetFields(Class clazz) { if (exclude.length() != 0) { outputln(exclude); } - boolean noWinCE = fieldData.getFlag("no_wince"); + boolean noWinCE = fieldData.getFlag(FLAG_NO_WINCE); if (noWinCE) { outputln("#ifndef _WIN32_WCE"); } @@ -417,7 +417,7 @@ void generateSetFields(Class clazz) { if (exclude.length() != 0) { outputln(exclude); } - boolean noWinCE = fieldData.getFlag("no_wince"); + boolean noWinCE = fieldData.getFlag(FLAG_NO_WINCE); if (noWinCE) { outputln("#ifndef _WIN32_WCE"); } diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties index aa5b090d45..6e4232d1bb 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties @@ -1067,7 +1067,7 @@ OS__g_object_get= OS__g_object_get_0=cast=GObject * OS__g_object_get_1=cast=(const gchar *),flags=no_out OS__g_object_get_2= -OS__g_object_get_3=cast=(const gchar *) +OS__g_object_get_3=cast=(const gchar *),flags=sentinel OS__g_object_get_qdata= OS__g_object_get_qdata_0=cast=(GObject *) @@ -1084,31 +1084,31 @@ OS__1g_1object_1set__I_3BFI= OS__1g_1object_1set__I_3BFI_0=cast=(gpointer) OS__1g_1object_1set__I_3BFI_1=cast=(const gchar *),flags=no_out OS__1g_1object_1set__I_3BFI_2= -OS__1g_1object_1set__I_3BFI_3=cast=(const gchar *) +OS__1g_1object_1set__I_3BFI_3=cast=(const gchar *),flags=sentinel OS__1g_1object_1set__I_3BII= OS__1g_1object_1set__I_3BII_0=cast=(gpointer) OS__1g_1object_1set__I_3BII_1=cast=(const gchar *),flags=no_out OS__1g_1object_1set__I_3BII_2= -OS__1g_1object_1set__I_3BII_3=cast=(const gchar *) +OS__1g_1object_1set__I_3BII_3=cast=(const gchar *),flags=sentinel OS__1g_1object_1set__I_3BJI= OS__1g_1object_1set__I_3BJI_0=cast=(gpointer) OS__1g_1object_1set__I_3BJI_1=cast=(const gchar *),flags=no_out OS__1g_1object_1set__I_3BJI_2= -OS__1g_1object_1set__I_3BJI_3=cast=(const gchar *) +OS__1g_1object_1set__I_3BJI_3=cast=(const gchar *),flags=sentinel OS__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I= OS__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_0=cast=(gpointer) OS__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_1=cast=(const gchar *) OS__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_2= -OS__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_3=cast=(const gchar *) +OS__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_3=cast=(const gchar *),flags=sentinel OS__1g_1object_1set__I_3BZI= OS__1g_1object_1set__I_3BZI_0=cast=(gpointer) OS__1g_1object_1set__I_3BZI_1=cast=(const gchar *),flags=no_out OS__1g_1object_1set__I_3BZI_2= -OS__1g_1object_1set__I_3BZI_3=cast=(const gchar *) +OS__1g_1object_1set__I_3BZI_3=cast=(const gchar *),flags=sentinel OS__g_object_set_qdata= OS__g_object_set_qdata_0=cast=(GObject *) @@ -4595,13 +4595,13 @@ OS__1gtk_1widget_1style_1get__I_3B_3II= OS__1gtk_1widget_1style_1get__I_3B_3II_0=cast=(GtkWidget *) OS__1gtk_1widget_1style_1get__I_3B_3II_1=cast=(const gchar *) OS__1gtk_1widget_1style_1get__I_3B_3II_2= -OS__1gtk_1widget_1style_1get__I_3B_3II_3=cast=(const gchar *) +OS__1gtk_1widget_1style_1get__I_3B_3II_3=cast=(const gchar *),flags=sentinel OS__1gtk_1widget_1style_1get__I_3B_3JI= OS__1gtk_1widget_1style_1get__I_3B_3JI_0=cast=(GtkWidget *) OS__1gtk_1widget_1style_1get__I_3B_3JI_1=cast=(const gchar *) OS__1gtk_1widget_1style_1get__I_3B_3JI_2= -OS__1gtk_1widget_1style_1get__I_3B_3JI_3=cast=(const gchar *) +OS__1gtk_1widget_1style_1get__I_3B_3JI_3=cast=(const gchar *),flags=sentinel OS__gtk_widget_translate_coordinates= OS__gtk_widget_translate_coordinates_0=cast=(GtkWidget *) |