From f79f52a59b578f7c7ecc25db50de51f2008142de Mon Sep 17 00:00:00 2001 From: Paul Pazderski Date: Sun, 3 May 2020 23:28:26 +0200 Subject: Bug 562754 - JNI code generation breaks on @param without description Change-Id: Ic73e5c55c4efbbde19f71db9a067a97834d2b0c8 Signed-off-by: Paul Pazderski --- .../JNI Generation/org/eclipse/swt/tools/internal/ASTMethod.java | 4 ++-- bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.swt.tools/pom.xml | 2 +- .../Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java | 2 +- features/org.eclipse.swt.tools.feature/feature.xml | 2 +- features/org.eclipse.swt.tools.feature/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTMethod.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTMethod.java index cecb2576a0..8e7f89d78b 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTMethod.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTMethod.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2017 IBM Corporation and others. + * Copyright (c) 2004, 2020 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -88,7 +88,7 @@ public ASTMethod(ASTClass declaringClass, String source, MethodDeclaration metho for (TagElement tag : tags) { if ("@param".equals(tag.getTagName())) { List fragments = tag.fragments(); - if (name.equals(fragments.get(0).toString())) { + if (fragments.size() >= 2 && name.equals(fragments.get(0).toString())) { String data = fragments.get(1).toString(); this.parameters[i].setMetaData(data); } diff --git a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF index cff07668f9..d03d251ce4 100644 --- a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.swt.tools; singleton:=true -Bundle-Version: 3.108.200.qualifier +Bundle-Version: 3.108.300.qualifier Bundle-ManifestVersion: 2 Export-Package: org.eclipse.swt.tools.internal; x-internal:=true Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.swt.tools/pom.xml b/bundles/org.eclipse.swt.tools/pom.xml index 77947d861a..2142ee61be 100644 --- a/bundles/org.eclipse.swt.tools/pom.xml +++ b/bundles/org.eclipse.swt.tools/pom.xml @@ -19,6 +19,6 @@ org.eclipse.swt org.eclipse.swt.tools - 3.108.200-SNAPSHOT + 3.108.300-SNAPSHOT eclipse-plugin diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java index 22ac80f23e..5af94583ba 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java @@ -2332,7 +2332,7 @@ public static final long SendMessage (long hWnd, int Msg, long wParam, TCHAR lPa * have this concept. *

* - * @param isDarkTheme + * @param isDarkTheme true for dark theme */ public static final void setTheme(boolean isDarkTheme) { System.setProperty("org.eclipse.swt.internal.win32.enableDarkScrollbars", Boolean.toString(isDarkTheme)); diff --git a/features/org.eclipse.swt.tools.feature/feature.xml b/features/org.eclipse.swt.tools.feature/feature.xml index 572f91d030..0c848e8c92 100644 --- a/features/org.eclipse.swt.tools.feature/feature.xml +++ b/features/org.eclipse.swt.tools.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.swt.tools.feature/pom.xml b/features/org.eclipse.swt.tools.feature/pom.xml index d999093861..84293db052 100644 --- a/features/org.eclipse.swt.tools.feature/pom.xml +++ b/features/org.eclipse.swt.tools.feature/pom.xml @@ -20,7 +20,7 @@ org.eclipse.swt.tools.feature org.eclipse.swt.tools.feature - 3.107.700-SNAPSHOT + 3.107.800-SNAPSHOT eclipse-feature -- cgit v1.2.3