diff --git a/.gitignore b/.gitignore index fd34fe14030..b7a19f0a08a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ bin/ *.log target/ +.polyglot.* +pom.tycho diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 00000000000..2cf738be41a --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,9 @@ + + + + + org.eclipse.tycho + tycho-build + 4.0.4 + + \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index b0df001ad0c..714790a1bf3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -92,7 +92,7 @@ pipeline { git config --global user.email 'eclipse-releng-bot@eclipse.org' git config --global user.name 'Eclipse Releng Bot' - ant -f eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml check_sources_and_update_sha1_file -DTAG=HEAD + ant -f eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml check_preprocessing ant -f eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml new_build_with_create_file -DTAG=HEAD ''' } diff --git a/bundles/org.eclipse.swt.tools.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.tools.base/META-INF/MANIFEST.MF index 0bd34bf5f07..d509599715d 100644 --- a/bundles/org.eclipse.swt.tools.base/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt.tools.base/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.swt.tools.base;singleton:=true -Bundle-Version: 3.107.400.qualifier +Bundle-Version: 3.107.500.qualifier Bundle-ManifestVersion: 2 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/bundles/org.eclipse.swt.tools.base/build.properties b/bundles/org.eclipse.swt.tools.base/build.properties index 8b25dbafb37..5e87f732b35 100644 --- a/bundles/org.eclipse.swt.tools.base/build.properties +++ b/bundles/org.eclipse.swt.tools.base/build.properties @@ -17,3 +17,6 @@ bin.includes = about.html,\ META-INF/,\ . src.includes = about.html + +pom.model.groupId = org.eclipse.swt +tycho.pomless.parent = ../../local-build/local-build-parent diff --git a/bundles/org.eclipse.swt.tools.base/pom.xml b/bundles/org.eclipse.swt.tools.base/pom.xml deleted file mode 100644 index 6b70b9aeb86..00000000000 --- a/bundles/org.eclipse.swt.tools.base/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.swt.localbuild - eclipse.platform.swt - 4.30.0-SNAPSHOT - ../../local-build/local-build-parent/ - - org.eclipse.swt - org.eclipse.swt.tools.base - 3.107.400-SNAPSHOT - eclipse-plugin - diff --git a/bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF index 4593e631629..434085fd9a1 100644 --- a/bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.swt.tools.spies;singleton:=true -Bundle-Version: 3.109.100.qualifier +Bundle-Version: 3.109.200.qualifier Bundle-ManifestVersion: 2 Export-Package: org.eclipse.swt.tools.internal, org.eclipse.swt.tools.views @@ -16,4 +16,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0", org.eclipse.ui;bundle-version="3.113.0", org.eclipse.e4.ui.di;bundle-version="1.2.600" Automatic-Module-Name: org.eclipse.swt.tools.spies -Import-Package: javax.annotation;version="1.2.0" +Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)" diff --git a/bundles/org.eclipse.swt.tools.spies/build.properties b/bundles/org.eclipse.swt.tools.spies/build.properties index 64df539f388..1fa93c17531 100644 --- a/bundles/org.eclipse.swt.tools.spies/build.properties +++ b/bundles/org.eclipse.swt.tools.spies/build.properties @@ -21,3 +21,6 @@ bin.includes = about.html,\ output.. = bin/ source.. = src/ src.includes = about.html + +pom.model.groupId = org.eclipse.swt +tycho.pomless.parent = ../../local-build/local-build-parent diff --git a/bundles/org.eclipse.swt.tools.spies/pom.xml b/bundles/org.eclipse.swt.tools.spies/pom.xml deleted file mode 100644 index 70564def8b3..00000000000 --- a/bundles/org.eclipse.swt.tools.spies/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.swt.localbuild - eclipse.platform.swt - 4.30.0-SNAPSHOT - ../../local-build/local-build-parent/ - - org.eclipse.swt - org.eclipse.swt.tools.spies - 3.109.100-SNAPSHOT - eclipse-plugin - diff --git a/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/Sleak.java b/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/Sleak.java index 8d9655d8778..c4127aa2318 100644 --- a/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/Sleak.java +++ b/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/Sleak.java @@ -31,7 +31,6 @@ * * Modify the main method below to launch your application. * Run Sleak. - * */ public class Sleak { List list; diff --git a/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/SpiesConstants.java b/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/SpiesConstants.java index 17839ee9557..3f8698604b1 100644 --- a/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/SpiesConstants.java +++ b/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/SpiesConstants.java @@ -13,7 +13,6 @@ /** * Interface containing constants for the Spies plug-in. - * */ public interface SpiesConstants { diff --git a/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/views/SleakView.java b/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/views/SleakView.java index e3985864e51..bbf444c9b8f 100644 --- a/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/views/SleakView.java +++ b/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/views/SleakView.java @@ -14,12 +14,12 @@ *******************************************************************************/ package org.eclipse.swt.tools.views; -import javax.annotation.*; - import org.eclipse.e4.ui.di.*; import org.eclipse.swt.tools.internal.*; import org.eclipse.swt.widgets.*; +import jakarta.annotation.*; + /** * Sleak view to trace native handler allocation */ diff --git a/bundles/org.eclipse.swt.tools/Icon Exe/org/eclipse/swt/tools/internal/IconExe.java b/bundles/org.eclipse.swt.tools/Icon Exe/org/eclipse/swt/tools/internal/IconExe.java index aeb0f9dfe60..ddd862db7ae 100644 --- a/bundles/org.eclipse.swt.tools/Icon Exe/org/eclipse/swt/tools/internal/IconExe.java +++ b/bundles/org.eclipse.swt.tools/Icon Exe/org/eclipse/swt/tools/internal/IconExe.java @@ -1101,7 +1101,6 @@ static class ImageLoader { * the background pixel for the logical screen (this * corresponds to the GIF89a Background Color Index value). * The default is -1 which means 'unspecified background' - * */ public int backgroundPixel; diff --git a/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup b/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup index 7d0754cdd63..d274c38c55a 100644 --- a/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup +++ b/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup @@ -38,6 +38,12 @@ remoteURI + + + Platform SWT remoteURI + + + Platform SWT remoteURI + + + SWT Website - - - 4.0.0 - - eclipse.platform.swt.localbuild - eclipse.platform.swt - 4.30.0-SNAPSHOT - ../../local-build/local-build-parent/ - - org.eclipse.swt - org.eclipse.swt.tools - 3.110.200-SNAPSHOT - eclipse-plugin - diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CBanner.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CBanner.java index 847bdee2796..eca34eb561c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CBanner.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CBanner.java @@ -100,7 +100,6 @@ public class CBanner extends Composite { * @exception SWTException - * */ public CBanner(Composite parent, int style) { super(parent, checkStyle(style)); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java index ef2683c7bd6..ede046a4a1b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java @@ -872,7 +872,6 @@ ToolBar getChevron() { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ /*public*/ boolean getChevronVisible() { checkWidget(); @@ -4176,7 +4175,6 @@ int getWrappedHeight (Point size) { *
  • ERROR_THREAD_INVALID_ACCESS when called from the wrong thread
    • *
  • ERROR_WIDGET_DISPOSED when the widget has been disposed
    • * - * */ /*public*/ void setChevronVisible(boolean visible) { checkWidget(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderRenderer.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderRenderer.java index 5aeca8ac701..d310a3172d2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderRenderer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderRenderer.java @@ -755,9 +755,6 @@ void drawBackground(GC gc, int[] shape, int x, int y, int width, int height, Col /* * Draw the border of the tab - * - * @param gc - * @param shape */ void drawBorder(GC gc, int[] shape) { @@ -1045,8 +1042,6 @@ void drawHighlight(GC gc, Rectangle bounds, int state, int rightEdge) { /* * Draw the unselected border for the receiver on the left. - * - * @param gc */ void drawLeftUnselectedBorder(GC gc, Rectangle bounds, int state) { int x = bounds.x; @@ -1184,8 +1179,6 @@ void drawMinimize(GC gc, Rectangle minRect, int minImageState) { /* * Draw the unselected border for the receiver on the right. - * - * @param gc */ void drawRightUnselectedBorder(GC gc, Rectangle bounds, int state) { int x = bounds.x; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java index bf219b809f0..e08c505885d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java @@ -118,7 +118,6 @@ public class ControlEditor { * Creates a ControlEditor for the specified Composite. * * @param parent the Composite above which this editor will be displayed -* */ public ControlEditor (Composite parent) { this.parent = parent; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java index e0d63ae5841..db39296bae3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java @@ -10235,10 +10235,7 @@ void setStyleRanges(int start, int length, int[] ranges, StyleRange[] styles, bo /** * * @param referenceRanges former ranges, sorted by order and without overlapping, typically returned {@link #getRanges(int, int)} - * @param referenceStyles * @param newRanges former ranges, sorted by order and without overlapping - * @param newStyles - * @return */ private SortedSet computeModifiedLines(int[] referenceRanges, StyleRange[] referenceStyles, int[] newRanges, StyleRange[] newStyles) { if (referenceStyles == null) { @@ -10329,9 +10326,6 @@ private boolean isInRange(int[] ranges, int styleIndex, int offset) { /** * The offset on which the range ends (excluded) - * @param ranges - * @param styleIndex - * @return */ private int endRangeOffset(int[] ranges, int styleIndex) { if (styleIndex < 0 || 2 * styleIndex > ranges.length) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java index 7004d371e3a..ad1ccc1cabc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java @@ -16,9 +16,6 @@ import org.eclipse.swt.graphics.*; import org.eclipse.swt.widgets.*; -/** - * - */ class StyledTextEvent extends Event { // used by LineStyleEvent int[] ranges; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java index d27682f46e3..293890e0a07 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java @@ -18,8 +18,6 @@ import org.eclipse.swt.widgets.*; class StyledTextListener extends TypedListener { -/** - */ StyledTextListener(SWTEventListener listener) { super(listener); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableCursor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableCursor.java index e4bb0512800..18f0225463b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableCursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableCursor.java @@ -195,7 +195,6 @@ public void getName(AccessibleEvent e) { * @see SelectionListener * @see SelectionEvent * @see #removeSelectionListener(SelectionListener) - * */ public void addSelectionListener(SelectionListener listener) { checkWidget(); @@ -626,7 +625,6 @@ public void setForeground (Color color) { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public void setSelection(int row, int column) { checkWidget(); @@ -649,7 +647,6 @@ public void setSelection(int row, int column) { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public void setSelection(TableItem row, int column) { checkWidget(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java index 574dd987a53..707b912a684 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java @@ -87,7 +87,6 @@ public class TableEditor extends ControlEditor { * Creates a TableEditor for the specified Table. * * @param table the Table Control above which this editor will be displayed -* */ public TableEditor (Table table) { super(table); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java index 0f91ee36006..981414bd82c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java @@ -87,7 +87,6 @@ public class TreeEditor extends ControlEditor { * Creates a TreeEditor for the specified Tree. * * @param tree the Tree Control above which this editor will be displayed -* */ public TreeEditor (Tree tree) { super(tree); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java index 4d508cb7257..c98a457f8c7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java @@ -25,7 +25,6 @@ *

    After the drop has completed successfully or has been aborted, the application which defines the * DragSource is required to take the appropriate cleanup action. In the case of a successful * move operation, the application must remove the data that was transferred.

    - * */ public interface DragSourceListener extends SWTEventListener { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java index 0e40f22dc1b..f41dc996aa7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java @@ -34,7 +34,6 @@ * operation that is performed but the data type is fixed.

    * * @see DropTargetEvent - * */ public interface DropTargetListener extends SWTEventListener { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java index 16b38fd6586..d5e95c3939d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java @@ -42,9 +42,11 @@ public class TextTransfer extends ByteArrayTransfer { private static final String COMPOUND_TEXT = "COMPOUND_TEXT"; //$NON-NLS-1$ private static final String UTF8_STRING = "UTF8_STRING"; //$NON-NLS-1$ private static final String STRING = "STRING"; //$NON-NLS-1$ + private static final String TEXT_PLAIN_UTF8 = "text/plain;charset=utf-8"; //RFC-1341 private static final int COMPOUND_TEXT_ID = GTK.GTK4 ? 0 : registerType(COMPOUND_TEXT); private static final int UTF8_STRING_ID = GTK.GTK4 ? 0 : registerType(UTF8_STRING); private static final int STRING_ID = GTK.GTK4 ? 0 : registerType(STRING); + private static final int TEXT_PLAIN_UTF8_ID = GTK.GTK4 ? 0 : registerType(TEXT_PLAIN_UTF8); private TextTransfer() {} @@ -88,11 +90,10 @@ public void javaToNative (Object object, TransferData transferData) { transferData.pValue = ctext[0]; transferData.result = 1; } - if (transferData.type == UTF8_STRING_ID) { + if (transferData.type == UTF8_STRING_ID || transferData.type == TEXT_PLAIN_UTF8_ID) { long pValue = OS.g_malloc(utf8.length); if (pValue == 0) return; C.memmove(pValue, utf8, utf8.length); - transferData.type = UTF8_STRING_ID; transferData.format = 8; transferData.length = utf8.length - 1; transferData.pValue = pValue; @@ -109,6 +110,7 @@ public void javaToNative (Object object, TransferData transferData) { } } + /** * This implementation of nativeToJava converts a platform specific * representation of plain text to a java String. @@ -145,7 +147,7 @@ protected int[] getTypeIds() { if(GTK.GTK4) { return new int[] {(int) OS.G_TYPE_STRING()}; } - return new int[] {UTF8_STRING_ID, STRING_ID}; + return new int[] {UTF8_STRING_ID, STRING_ID, TEXT_PLAIN_UTF8_ID}; } @Override @@ -157,7 +159,7 @@ protected String[] getTypeNames() { return new String[] {"text/plain", STRING}; } - return new String[] {UTF8_STRING, STRING}; + return new String[] {UTF8_STRING, STRING, TEXT_PLAIN_UTF8}; } boolean checkText(Object object) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java index ef66e050ce2..bd7921e127c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java @@ -35,7 +35,6 @@ * @see DragSourceEffect * @see DragSourceEvent * @see Sample code and further information - * */ public class ListDragSourceEffect extends DragSourceEffect { Image dragSourceImage = null; diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java index 6e6b314a9b5..d226cf52906 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java @@ -25,7 +25,6 @@ * OLE contains all the constants used to create an ActiveX Control or an OLE Document. * *

    Definitions for these constants can be found in MSDN. - * */ public class OLE extends SWT { diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java index 7dcb01ec57c..9d1d1a7980d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java @@ -660,7 +660,6 @@ public int doVerb(int verb) { * @param out the return value of the command * * @return an HRESULT value; OLE.S_OK is returned if successful - * */ public int exec(int cmdID, int options, Variant in, Variant out) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java index 2b47969c11c..29c0eac261a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java @@ -19,7 +19,6 @@ * look up mechanism that maps an event type * to a listener. Multiple listeners for the * same event type are supported. -* */ class OleEventTable { diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java index fa5f3282ec7..66e6df9a2b1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java @@ -89,7 +89,6 @@ final public class OleFrame extends Composite * @exception SWTException

    - * */ public OleFrame(Composite parent, int style) { super(parent, style); @@ -382,7 +381,6 @@ object, returns the outer rectangle (relative to the window) where the object ca * * @return the application menu items that will appear in the Container location when an OLE Document * is in-place activated. - * */ public MenuItem[] getContainerMenus(){ return containerMenuItems; @@ -400,7 +398,6 @@ public MenuItem[] getContainerMenus(){ * * @return the application menu items that will appear in the File location when an OLE Document * is in-place activated. - * */ public MenuItem[] getFileMenus(){ return fileMenuItems; @@ -440,7 +437,6 @@ private int GetWindow(long phwnd) { * * @return the application menu items that will appear in the Window location when an OLE Document * is in-place activated. - * */ public MenuItem[] getWindowMenus(){ return windowMenuItems; diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java index c75a3bccb4e..3b645e59204 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java @@ -23,7 +23,6 @@ * *

    It is used within the OleAutomation object for getting a property, setting a property or invoking * a method on an OLE Control or OLE Document. - * */ public final class Variant { /** @@ -115,7 +114,6 @@ public Variant() { * Create a Variant object which represents a Java float as a VT_R4. * * @param val the Java float value that this Variant represents - * */ public Variant(float val) { type = COM.VT_R4; @@ -136,7 +134,6 @@ public Variant(double val) { * Create a Variant object which represents a Java int as a VT_I4. * * @param val the Java int value that this Variant represents - * */ public Variant(int val) { type = COM.VT_I4; @@ -152,7 +149,6 @@ public Variant(int val) { * * @param ptr a pointer to the data being transferred. * @param byRefType the type of the data being transferred such as OLE.VT_BSTR | OLE.VT_BYREF - * */ public Variant(long ptr, short byRefType) { type = byRefType; @@ -162,7 +158,6 @@ public Variant(long ptr, short byRefType) { * Create a Variant object which represents an IDispatch interface as a VT_Dispatch. * * @param automation the OleAutomation object that this Variant represents - * */ public Variant(OleAutomation automation) { type = COM.VT_DISPATCH; @@ -176,7 +171,6 @@ public Variant(OleAutomation automation) { * @since 2.0 * * @param idispatch the IDispatch object that this Variant represents - * */ public Variant(IDispatch idispatch) { type = COM.VT_DISPATCH; @@ -189,7 +183,6 @@ public Variant(IDispatch idispatch) { * this Variant. * * @param unknown the IUnknown object that this Variant represents - * */ public Variant(IUnknown unknown) { type = COM.VT_UNKNOWN; @@ -210,7 +203,6 @@ public Variant(long val) { * Create a Variant object which represents a Java String as a VT_BSTR. * * @param string the Java String value that this Variant represents - * */ public Variant(String string) { type = COM.VT_BSTR; @@ -220,7 +212,6 @@ public Variant(String string) { * Create a Variant object which represents a Java short as a VT_I2. * * @param val the Java short value that this Variant represents - * */ public Variant(short val) { type = COM.VT_I2; @@ -230,7 +221,6 @@ public Variant(short val) { * Create a Variant object which represents a Java boolean as a VT_BOOL. * * @param val the Java boolean value that this Variant represents - * */ public Variant(boolean val) { type = COM.VT_BOOL; @@ -355,7 +345,6 @@ public IDispatch getDispatch() { * @exception SWTException

    - * */ public boolean getBoolean() { if (type == COM.VT_EMPTY) { @@ -389,7 +378,6 @@ public boolean getBoolean() { *

    If this Variant does not contain a reference to data, zero is returned. * * @return a pointer to the referenced data represented by this Variant or 0 - * */ public long getByRef() { if (type == COM.VT_EMPTY) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java index 2bf4c89df83..5b556771862 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java @@ -13,10 +13,15 @@ *******************************************************************************/ package org.eclipse.swt.internal; -import java.io.*; -import java.net.*; -import java.nio.file.*; -import java.util.jar.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.JarURLConnection; +import java.net.URL; +import java.net.URLConnection; +import java.nio.file.Files; +import java.nio.file.StandardCopyOption; +import java.util.jar.Attributes; public class Library { @@ -35,7 +40,7 @@ public class Library { /** * SWT revision number (must be >= 0) */ - static int REVISION = 3; + static int REVISION = 5; /** * The JAVA and SWT versions @@ -116,9 +121,6 @@ static int parseVersion(String version) { /** * Returns the Java version number as an integer. * - * @param major - * @param minor - * @param micro * @return the version */ public static int JAVA_VERSION (int major, int minor, int micro) { @@ -128,8 +130,6 @@ public static int JAVA_VERSION (int major, int minor, int micro) { /** * Returns the SWT version number as an integer. * - * @param major - * @param minor * @return the version */ public static int SWT_VERSION (int major, int minor) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java index 03f09c55410..5542c86947e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java @@ -944,13 +944,11 @@ public class GTK extends OS { /** * @param label cast=(GtkLabel *) * @param xalign cast=(gfloat) - * */ public static final native void gtk_label_set_xalign(long label, float xalign); /** * @param label cast=(GtkLabel *) * @param yalign cast=(gfloat) - * */ public static final native void gtk_label_set_yalign(long label, float yalign); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/ImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/ImageLoader.java index bbe5ac8d518..5b063ab2e78 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/ImageLoader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/ImageLoader.java @@ -78,7 +78,6 @@ public class ImageLoader { * the background pixel for the logical screen (this * corresponds to the GIF89a Background Color Index value). * The default is -1 which means 'unspecified background' - * */ public int backgroundPixel; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java index adb2b99efb5..7dbe8e518c5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java @@ -207,7 +207,6 @@ static long polyRgn(int[] pointArray, int count) { * * * @since 3.0 - * */ public void add (int[] pointArray) { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/internal/graphics/ImageUtil.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/internal/graphics/ImageUtil.java index 10c422d8a0d..3e74cacf364 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/internal/graphics/ImageUtil.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/internal/graphics/ImageUtil.java @@ -22,7 +22,6 @@ * Not used on other platforms * * @since 3.110 - * */ public class ImageUtil { /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java index 8e39df48f7d..5b04b5e5ecc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java @@ -3506,7 +3506,6 @@ static long getCurrentKeyLayout () { * * * @since 3.0 - * */ public boolean post(Event event) { synchronized (Device.class) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java index 76f146bb8ba..d0b5067c677 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java @@ -1163,7 +1163,6 @@ public Point getMinimumSize () { * * * @since 3.0 - * */ @Override public Region getRegion () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java index b7a2f8eaf17..ebaafb30163 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java @@ -392,7 +392,6 @@ public void setImage (Image image) { *

  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ @Override public void setText (String string) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java index e2b84453f98..59e3a77847d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java @@ -521,7 +521,6 @@ public int getWidth () { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public void pack () { checkWidget (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java index f3be9bf4ef3..58440eac0ca 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java @@ -159,7 +159,6 @@ public String getOverlayText () { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public TaskBar getParent () { checkWidget (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java index b3848ac4318..c8789d53704 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java @@ -523,7 +523,6 @@ public int getWidth () { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public void pack () { checkWidget (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java index b9982aa2d76..692868bedf2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java @@ -392,7 +392,6 @@ void destroyWidget () { * * * @since 2.0 - * */ public Color getBackground () { checkWidget (); @@ -597,7 +596,6 @@ public Font getFont (int index) { * * * @since 2.0 - * */ public Color getForeground () { checkWidget (); @@ -1055,7 +1053,6 @@ void sendExpand (boolean expand, boolean recurse) { * * * @since 2.0 - * */ public void setBackground (Color color) { checkWidget (); @@ -1087,7 +1084,6 @@ public void setBackground (Color color) { * * * @since 3.1 - * */ public void setBackground (int index, Color color) { checkWidget (); @@ -1244,7 +1240,6 @@ public void setFont (int index, Font font) { * * * @since 2.0 - * */ public void setForeground (Color color) { checkWidget (); @@ -1276,7 +1271,6 @@ public void setForeground (Color color) { * * * @since 3.1 - * */ public void setForeground (int index, Color color){ checkWidget (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak index 172cf0e2724..ca12ff20fa1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak @@ -14,5 +14,5 @@ maj_ver=4 min_ver=963 -rev=3 -comma_ver=4,963,3,0 \ No newline at end of file +rev=5 +comma_ver=4,963,5,0 \ No newline at end of file diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SwtRunnable.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SwtRunnable.java index 9e0497aa203..6460043ae94 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SwtRunnable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SwtRunnable.java @@ -17,7 +17,6 @@ * A method that returns no result and may throw a checked exception of the given * type. * @since 3.123 - * */ @FunctionalInterface public interface SwtRunnable { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGBA.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGBA.java index 43f450ea1aa..efb687c0050 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGBA.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGBA.java @@ -89,7 +89,6 @@ public RGBA(int red, int green, int blue, int alpha) { * the saturation or brightness is not between 0 and 1 or if the alpha * is not between 0 and 255 * -* */ public RGBA(float hue, float saturation, float brightness, float alpha) { if ((alpha > 255) || (alpha < 0)) SWT.error(SWT.ERROR_INVALID_ARGUMENT); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java index 4ac32acfbe2..943cddc9fd4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java @@ -22,7 +22,6 @@ /** * Abstract factory class for loading/unloading images from files or streams * in various image file formats. - * */ public abstract class FileFormat { static final String FORMAT_PACKAGE = "org.eclipse.swt.internal.image"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/BorderLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/BorderLayout.java index 1c037f74583..33822bf3a34 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/BorderLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/BorderLayout.java @@ -84,7 +84,6 @@ public class BorderLayout extends Layout { * placed along the left and right edges of the layout. * * The default value is 0. - * */ public int marginWidth = 0; /** @@ -92,7 +91,6 @@ public class BorderLayout extends Layout { * placed along the top and bottom edges of the layout. * * The default value is 0. - * */ public int marginHeight = 0; /** @@ -100,7 +98,6 @@ public class BorderLayout extends Layout { * neighboring regions. * * The default value is 0. - * */ public int spacing = 0; /** @@ -108,7 +105,6 @@ public class BorderLayout extends Layout { * and its neighboring control inside a region. * * The default value is 0. - * */ public int controlSpacing = 0; /** @@ -125,7 +121,6 @@ public class BorderLayout extends Layout { * controls, valid values range between [0 ... 1] * * The default value is 0.5 (equal distribution of available space) - * */ public double heightDistributionFactor = 0.5; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java index e86c2a3d1b7..6aa9f99f034 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java @@ -108,7 +108,6 @@ void setClientArea (Rectangle rect) { * @return the receiver's hash * * @see #equals(Object) - * */ @Override public int hashCode () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java index 629c90038be..a53328dea3e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java @@ -52,13 +52,11 @@ public static void addLanguageListener (Control control, Runnable runnable) { } /* * Not implemented. - * */ public static void drawGlyphs(GC gc, char[] renderBuffer, int[] renderDx, int x, int y) { } /* * Bidi not supported on emulated platforms. - * */ public static boolean isBidiPlatform() { return false; @@ -77,13 +75,11 @@ public static int getFontBidiAttributes(GC gc) { } /* * Not implemented. - * */ public static void getOrderInfo(GC gc, String text, int[] order, byte[] classBuffer, int flags, int [] offsets) { } /* * Not implemented. Returns null. - * */ public static char[] getRenderInfo(GC gc, String text, int[] order, byte[] classBuffer, int[] dx, int flags, int[] offsets) { return null; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/taskbar/org/eclipse/swt/widgets/TaskItem.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/taskbar/org/eclipse/swt/widgets/TaskItem.java index 8189395763f..589ca8671ba 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/taskbar/org/eclipse/swt/widgets/TaskItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/taskbar/org/eclipse/swt/widgets/TaskItem.java @@ -146,7 +146,6 @@ public String getOverlayText () { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public TaskBar getParent () { checkWidget (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java index 39fe7d3a260..193390ef52d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java @@ -263,7 +263,6 @@ void configure () { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public boolean getAutoHide () { checkWidget (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java index 7a0f7aee609..89b97cd86e6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java @@ -83,7 +83,6 @@ public class ImageLoader { * the background pixel for the logical screen (this * corresponds to the GIF89a Background Color Index value). * The default is -1 which means 'unspecified background' - * */ public int backgroundPixel; @@ -170,7 +169,6 @@ public ImageData[] load(InputStream stream) { /** * Return true if the image is an interlaced PNG file. * This is used to check whether ImageLoaderEvent should be fired when loading images. - * @param imageAsByteArray * @return true iff 29th byte of PNG files is not zero */ boolean isInterlacedPNG(byte [] imageAsByteArray) { @@ -315,8 +313,6 @@ public ImageData[] load(String filename) { /** * Load GdkPixbuf directly using gdk_pixbuf_new_from_file, * without FileInputStream. - * @param filename - * @return */ ImageData[] loadFromFile(String filename) { long pixbuf = gdk_pixbuf_new_from_file(filename); @@ -363,7 +359,6 @@ int getImageFormat(long loader) { /** * Convert GdkPixbuf pointer to Java object ImageData - * @param pixbuf * @return ImageData with pixbuf data */ static ImageData pixbufToImageData(long pixbuf) { @@ -426,8 +421,6 @@ static ImageData pixbufToImageData(long pixbuf) { /** * Returns GdkPixbuf pointer by loading an image from filename (Java string) - * @param filename - * @return */ static long gdk_pixbuf_new_from_file(String filename) { int length = filename.length (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java index 3f5e472de78..283d19df049 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java @@ -152,7 +152,6 @@ static void cairo_region_get_rectangles(long region, long [] rectangles, int[] n * * * @since 3.0 - * */ public void add (int[] pointArray) { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java index 78def99d4af..648c9ac8dcd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java @@ -99,7 +99,6 @@ public static class GDBusMethod { * (args) -> { * return new Object[] {true}; // You should 'g_variant_unref(result)' on client side. * }) - * */ public GDBusMethod(String name, String [][] inputArgs, String [][] outputArgs, Function userFunction) { this.name = name; @@ -292,7 +291,6 @@ private static long onNameLost (long connection, long name, long user_data) { * @param gvar_parameters GVariant * @param invocation GDBusMethodInvocation * @param user_data gpointer - * @return */ @SuppressWarnings("unused") // Callback only called directly by JNI. private static long handleMethod ( diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java index dec856014eb..224dab38809 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java @@ -293,7 +293,6 @@ long eventSurface () { /** * GdkEventType constants different on GTK4 and GTK3. * This checks for GTK versions and return the correct constants defined in GDK.java - * @param eventType * @return constant defined */ static int fixGdkEventTypeValues(int eventType) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java index 1906552587f..1e200aa53b8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java @@ -269,9 +269,6 @@ protected void checkSubclass () { * is at the longest length possible. i.e. Assume DATE/HOUR field to be double digit, * MONTH field for SWT.DATE | SWT.LONG is the longest text. * - * @param wHint - * @param hHint - * @param changed * @return text entry size to hold the longest possible formatted text. */ Point computeMaxTextSize (int wHint, int hHint, boolean changed) { @@ -1322,8 +1319,6 @@ public void removeSelectionListener (SelectionListener listener) { /** * selects the first occurrence of the given field - * - * @param field */ void selectField(Field field) { AttributedCharacterIterator iterator = dateFormat.formatToCharacterIterator(calendar.getTime()); @@ -1340,10 +1335,6 @@ void selectField(Field field) { /** * Selects the given field at the given start/end coordinates - * - * @param field - * @param start - * @param end */ void selectField(FieldPosition fieldPosition) { boolean sameField = isSameField(fieldPosition, currentField); @@ -2352,9 +2343,6 @@ void releaseWidget () { /** * Returns a field with updated positionla data - * - * @param field - * @return */ private FieldPosition updateField(FieldPosition field) { AttributedCharacterIterator iterator = dateFormat.formatToCharacterIterator(calendar.getTime()); @@ -2400,7 +2388,6 @@ private FieldPosition getNextField(FieldPosition field) { /** * - * @param field * @return the next field of the given one */ private FieldPosition getPreviousField(FieldPosition field) { @@ -2488,7 +2475,6 @@ private static boolean isSameField(FieldPosition p1, FieldPosition p2) { /** * Extracts the calendarfield for the given fieldposition * - * @param fieldPosition * @return the {@link Calendar} field or -1 if this is not a valid Fieldposition */ private static int getCalendarField(FieldPosition fieldPosition) { @@ -2502,7 +2488,6 @@ private static int getCalendarField(FieldPosition fieldPosition) { /** * Extracts the calendarfield transforming HOUR1 types to HOUR0 * - * @param field * @return the calendarfield coresponding to the {@link Field} */ private static int getCalendarField(Field field) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java index 9568c46fe9e..0df349dda82 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java @@ -4272,7 +4272,6 @@ long findFocusedWindow() { * * * @since 3.0 - * */ public boolean post (Event event) { /* diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java index ab124f75641..ef7f487dca3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java @@ -565,7 +565,7 @@ void presetChooserDialog () { * * @param extension file extension as a string * - * @returns true if the extension contains any of the glob pattern wildcards + * @return true if the extension contains any of the glob pattern wildcards */ private boolean isGlobPattern (String extension) { if (extension.contains ("*") || diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java index 646e530603c..3843e20124c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java @@ -1393,7 +1393,6 @@ public boolean getVisible () { * * * @since 3.0 - * */ @Override public Region getRegion () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java index 28782a314f1..64479c09e02 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java @@ -463,7 +463,6 @@ void setOrientation (boolean create) { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ @Override public void setText (String string) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java index 5af05f7948c..8fbaec89777 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java @@ -469,7 +469,6 @@ void hookEvents () { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public void pack () { checkWidget(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java index 5ae6df273d9..c6f99130fed 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java @@ -2059,7 +2059,6 @@ public void insert (String string) { * @param iter the GtkTextIter representing the insertion/selection point * @param scrollTo the GtkTextIter representing the point to be scrolled to (can be null) * @param insert true if insertion is being performed, false if selection - * */ private void scrollIfNotVisible(byte [] iter, byte [] scrollTo, boolean insert) { GdkRectangle rect = new GdkRectangle (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java index 8d588b767ca..9f467287625 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java @@ -366,7 +366,6 @@ void destroyWidget () { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public boolean getAutoHide () { checkWidget (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java index d1b5d9eb813..d2d967f0a62 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java @@ -337,8 +337,6 @@ Rectangle computeBounds () { * - Rectangles can have absolute coords [Tracker(Display)] or relative to parent [Tracker(Composite)] * - This method is called a lot, optimize your code. * - Note, region != rectangle. A region can have a non-squared form, e.g an 'L' shape. - * - * @param rects */ void drawRectangles (Rectangle [] rects) { long gdkResource = 0; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java index 0dd7ac6f475..6208ef498a2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java @@ -461,7 +461,6 @@ void hookEvents () { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public void pack () { checkWidget(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java index 346d6a8e6a2..6c127c3f23f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java @@ -363,7 +363,6 @@ void destroyWidget () { * * * @since 2.0 - * */ public Color getBackground () { checkWidget (); @@ -603,7 +602,6 @@ public Font getFont (int index) { * * * @since 2.0 - * */ public Color getForeground () { checkWidget (); @@ -1138,7 +1136,6 @@ public void removeAll () { * * * @since 2.0 - * */ public void setBackground (Color color) { checkWidget (); @@ -1168,7 +1165,6 @@ public void setBackground (Color color) { * * * @since 3.1 - * */ public void setBackground (int index, Color color) { checkWidget (); @@ -1377,7 +1373,6 @@ public void setFont (int index, Font font) { * * * @since 2.0 - * */ public void setForeground (Color color){ checkWidget (); @@ -1407,7 +1402,6 @@ public void setForeground (Color color){ * * * @since 3.1 - * */ public void setForeground (int index, Color color){ checkWidget (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java index cf6ca6a98b3..ee086b24725 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java @@ -2570,7 +2570,6 @@ void gtk_widget_get_preferred_size (long widget, GtkRequisition requisition){ * Retrieves the amount of space around the outside of the container. * On GTK3: this is done using gtk_container_get_border_width. * On GTK4: this is done by returning the max margin on any side. - * @param handle * @return amount of space around the outside of the container. */ int gtk_container_get_border_width_or_margin (long handle) { @@ -2586,8 +2585,6 @@ int gtk_container_get_border_width_or_margin (long handle) { } /** * Sets the border width of the container to all sides of the container. - * @param handle - * @param border_width */ void gtk_container_set_border_width (long handle, int border_width) { if (GTK.GTK4) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java index b3df1250569..baa5273ea5f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java @@ -604,7 +604,6 @@ static long createGdipFont(long hDC, long hFont, long graphics, long fontCollect * The returned brush has to be disposed by the caller. * * @param brush Brush with pattern - * @param alpha * @return new brush with transparency * @exception SWTError
      *
    • ERROR_CANNOT_BE_ZERO - if the image in the brush is null
      • diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/ImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/ImageLoader.java index f309c6186a0..2fe55b38810 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/ImageLoader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/ImageLoader.java @@ -78,7 +78,6 @@ public class ImageLoader { * the background pixel for the logical screen (this * corresponds to the GIF89a Background Color Index value). * The default is -1 which means 'unspecified background' - * */ public int backgroundPixel; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java index e2409b4772c..4cdea1cd0c8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java @@ -114,7 +114,6 @@ public Region (Device device) { *
    * * @since 3.0 - * */ public void add (int[] pointArray) { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java index e82583480e8..cc2750b86f8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java @@ -3486,7 +3486,6 @@ int numpadKey (int key) { * * * @since 3.0 - * */ public boolean post (Event event) { synchronized (Device.class) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java index 2175d13b49a..cb96a2cbd91 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java @@ -1141,7 +1141,6 @@ public boolean getModified () { * * * @since 3.0 - * */ @Override public Region getRegion () { @@ -2323,7 +2322,6 @@ int widgetStyle () { * * WS_OVERLAPPED = 0 * WS_CAPTION = WS_BORDER | WS_DLGFRAME - * */ return bits | OS.WS_OVERLAPPED | OS.WS_CAPTION; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java index 62d29aa302d..d8cea0913b3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java @@ -343,7 +343,6 @@ public void setImage (Image image) { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ @Override public void setText (String string) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java index dd3638e1205..d9acb9239ee 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java @@ -4604,7 +4604,6 @@ void setItemHeight (boolean fixScroll) { * visible and are shown afterwards. The fix is to * save the top index, scroll to the top of the table * and then restore the original top index. - * */ int topIndex = getTopIndex (); if (fixScroll && topIndex != 0) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java index 097ab46efa5..9ba9d5d4c50 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java @@ -401,7 +401,6 @@ private int calcAutoWidth(int index, boolean withHeader) { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public void pack () { checkWidget (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java index 86e09819e59..bffb472388a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java @@ -174,7 +174,6 @@ public String getOverlayText () { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public TaskBar getParent () { checkWidget (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java index a6d0398c8d3..fcef3775924 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java @@ -143,7 +143,6 @@ void destroyWidget () { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public boolean getAutoHide () { checkWidget(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java index 495b10a7566..f5db5f961be 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java @@ -338,7 +338,6 @@ int getWidthInPixels () { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public void pack () { checkWidget (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java index 494f9874dc5..4758478318f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java @@ -328,7 +328,6 @@ long fontHandle (int index) { * * * @since 2.0 - * */ public Color getBackground () { checkWidget (); @@ -636,7 +635,6 @@ public Font getFont (int index) { * * * @since 2.0 - * */ public Color getForeground () { checkWidget (); @@ -1070,7 +1068,6 @@ public void removeAll () { * * * @since 2.0 - * */ public void setBackground (Color color) { checkWidget (); @@ -1105,7 +1102,6 @@ public void setBackground (Color color) { * * * @since 3.1 - * */ public void setBackground (int index, Color color) { checkWidget (); @@ -1484,7 +1480,6 @@ public void setFont (int index, Font font) { * * * @since 2.0 - * */ public void setForeground (Color color) { checkWidget (); @@ -1519,7 +1514,6 @@ public void setForeground (Color color) { * * * @since 3.1 - * */ public void setForeground (int index, Color color){ checkWidget (); diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 61c7a52f11a..a83a9674428 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -34,8 +34,6 @@ - - @@ -189,33 +187,6 @@ - - - - - - - - - - - - - - - - - - - - - - Has source changes: ${source_changed}, compared against: - - - - - @@ -234,24 +205,6 @@ - - - - - - - - - - - - - - - - - - @@ -475,33 +428,6 @@ - - - - - - - - - - - - - - - - - - - - - - Has native changes: ${natives_changed}, compared against: - - - - - @@ -514,7 +440,6 @@ - - - - - - - SHA1=${HEAD_TAG} - - - - - - - - - - - - - - @@ -582,7 +484,6 @@ - @@ -932,6 +833,7 @@ + @@ -947,7 +849,7 @@ true - + diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml index 2dca42aa407..29f78130438 100644 --- a/bundles/org.eclipse.swt/pom.xml +++ b/bundles/org.eclipse.swt/pom.xml @@ -29,7 +29,7 @@ forceContextQualifier gets updated during build input process using ant script /bundles/org.eclipse.swt/buildInternal.xml --> - v20231026-1222 + v20231110-1828 Eclipse SWT Accessibility/cocoa,Eclipse SWT Accessibility/common,Eclipse SWT Accessibility/gtk,Eclipse SWT Accessibility/win32,Eclipse SWT AWT/cocoa,Eclipse SWT AWT/common,Eclipse SWT AWT/gtk,Eclipse SWT AWT/win32,Eclipse SWT Browser/cocoa,Eclipse SWT Browser/common,Eclipse SWT Browser/gtk,Eclipse SWT Browser/win32,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/cocoa,Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/gtk,Eclipse SWT Drag and Drop/win32,Eclipse SWT OLE Win32/win32,Eclipse SWT OpenGL/cocoa,Eclipse SWT OpenGL/common,Eclipse SWT OpenGL/glx,Eclipse SWT OpenGL/gtk,Eclipse SWT OpenGL/win32,Eclipse SWT PI/cairo,Eclipse SWT PI/cocoa,Eclipse SWT PI/common,Eclipse SWT PI/gtk,Eclipse SWT PI/win32,Eclipse SWT Printing/cocoa,Eclipse SWT Printing/common,Eclipse SWT Printing/gtk,Eclipse SWT Printing/win32,Eclipse SWT Program/cocoa,Eclipse SWT Program/common,Eclipse SWT Program/gtk,Eclipse SWT Program/win32,Eclipse SWT WebKit/cocoa,Eclipse SWT WebKit/gtk,Eclipse SWT/cairo,Eclipse SWT/cocoa,Eclipse SWT/common,Eclipse SWT/emulated/bidi,Eclipse SWT/emulated/coolbar,Eclipse SWT/emulated/expand,Eclipse SWT/emulated/taskbar,Eclipse SWT/emulated/tooltip,Eclipse SWT/gtk,Eclipse SWT/win32 diff --git a/container/Dockerfile b/container/Dockerfile index 87ff45f5087..7284da55444 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipsecbi/fedora-gtk3-mutter:39-gtk3.24@sha256:de04efe06d49be67c6a37071e5d8e4109a8b714160a3abf6bcb738819617ddef +FROM eclipsecbi/fedora-gtk3-mutter:39-gtk3.24@sha256:26d277fb261bf1dab24ee01d62473c01e79c09b86cc858c78fb81d2b72db74e5 # Back to root for install USER 0 diff --git a/examples/org.eclipse.swt.examples.browser.demos/META-INF/MANIFEST.MF b/examples/org.eclipse.swt.examples.browser.demos/META-INF/MANIFEST.MF index 2d0345cb231..8c80f9314b8 100644 --- a/examples/org.eclipse.swt.examples.browser.demos/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.swt.examples.browser.demos/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.SWTBrowserDemos.name Bundle-SymbolicName: org.eclipse.swt.examples.browser.demos; singleton:=true -Bundle-Version: 3.108.100.qualifier +Bundle-Version: 3.108.200.qualifier Bundle-Activator: org.eclipse.swt.examples.browser.demos.BrowserDemoPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/examples/org.eclipse.swt.examples.browser.demos/build.properties b/examples/org.eclipse.swt.examples.browser.demos/build.properties index e872df5d62a..06e360907e6 100644 --- a/examples/org.eclipse.swt.examples.browser.demos/build.properties +++ b/examples/org.eclipse.swt.examples.browser.demos/build.properties @@ -25,3 +25,6 @@ bin.includes = doc-html/,\ icons/,\ META-INF/ src.includes=about.html + +pom.model.groupId = org.eclipse.swt +tycho.pomless.parent = ../../local-build/local-build-parent diff --git a/examples/org.eclipse.swt.examples.browser.demos/pom.xml b/examples/org.eclipse.swt.examples.browser.demos/pom.xml deleted file mode 100644 index 4b53c8cea24..00000000000 --- a/examples/org.eclipse.swt.examples.browser.demos/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.swt.localbuild - eclipse.platform.swt - 4.30.0-SNAPSHOT - ../../local-build/local-build-parent/ - - org.eclipse.swt - org.eclipse.swt.examples.browser.demos - 3.108.100-SNAPSHOT - eclipse-plugin - diff --git a/examples/org.eclipse.swt.examples.launcher/META-INF/MANIFEST.MF b/examples/org.eclipse.swt.examples.launcher/META-INF/MANIFEST.MF index b31763f0035..3cf6cf3585e 100644 --- a/examples/org.eclipse.swt.examples.launcher/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.swt.examples.launcher/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.SWTLauncherExample.name Bundle-SymbolicName: org.eclipse.swt.examples.launcher; singleton:=true -Bundle-Version: 3.108.100.qualifier +Bundle-Version: 3.108.200.qualifier Bundle-Activator: org.eclipse.swt.examples.launcher.LauncherPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/examples/org.eclipse.swt.examples.launcher/build.properties b/examples/org.eclipse.swt.examples.launcher/build.properties index 78e2ee1ae43..59c12925629 100644 --- a/examples/org.eclipse.swt.examples.launcher/build.properties +++ b/examples/org.eclipse.swt.examples.launcher/build.properties @@ -24,3 +24,6 @@ bin.includes = doc/,\ src.includes = about.html source.. = src/ + +pom.model.groupId = org.eclipse.swt +tycho.pomless.parent = ../../local-build/local-build-parent diff --git a/examples/org.eclipse.swt.examples.launcher/pom.xml b/examples/org.eclipse.swt.examples.launcher/pom.xml deleted file mode 100644 index 73d61450cdc..00000000000 --- a/examples/org.eclipse.swt.examples.launcher/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.swt.localbuild - eclipse.platform.swt - 4.30.0-SNAPSHOT - ../../local-build/local-build-parent/ - - org.eclipse.swt - org.eclipse.swt.examples.launcher - 3.108.100-SNAPSHOT - eclipse-plugin - diff --git a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/ItemDescriptor.java b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/ItemDescriptor.java index adf5a9d7db9..bed471e6329 100644 --- a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/ItemDescriptor.java +++ b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/ItemDescriptor.java @@ -14,8 +14,9 @@ package org.eclipse.swt.examples.launcher; -import org.eclipse.core.runtime.*; -import org.eclipse.swt.graphics.*; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.swt.graphics.Image; /** * ItemDescriptor collects information about a launch item. @@ -95,7 +96,7 @@ public String getDescription() { /** * Returns an icon for this descriptor * - * @returns an icon, null if the item is a folder + * @return an icon, null if the item is a folder */ public Image getIcon() { return icon; diff --git a/examples/org.eclipse.swt.examples.views/META-INF/MANIFEST.MF b/examples/org.eclipse.swt.examples.views/META-INF/MANIFEST.MF index 860ae006e29..f89fd48701f 100644 --- a/examples/org.eclipse.swt.examples.views/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.swt.examples.views/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.SWTPaintExample.name Bundle-SymbolicName: org.eclipse.swt.examples.views;singleton:=true -Bundle-Version: 3.108.100.qualifier +Bundle-Version: 3.108.200.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, diff --git a/examples/org.eclipse.swt.examples.views/build.properties b/examples/org.eclipse.swt.examples.views/build.properties index ad52b15a7b7..8a4776b2eb7 100644 --- a/examples/org.eclipse.swt.examples.views/build.properties +++ b/examples/org.eclipse.swt.examples.views/build.properties @@ -22,3 +22,6 @@ bin.includes = doc-html/,\ src.includes = about.html source.. = src/ + +pom.model.groupId = org.eclipse.swt +tycho.pomless.parent = ../../local-build/local-build-parent diff --git a/examples/org.eclipse.swt.examples.views/pom.xml b/examples/org.eclipse.swt.examples.views/pom.xml deleted file mode 100644 index 33387d292dd..00000000000 --- a/examples/org.eclipse.swt.examples.views/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.swt.localbuild - eclipse.platform.swt - 4.30.0-SNAPSHOT - ../../local-build/local-build-parent/ - - org.eclipse.swt - org.eclipse.swt.examples.views - 3.108.100-SNAPSHOT - eclipse-plugin - diff --git a/examples/org.eclipse.swt.examples/build.properties b/examples/org.eclipse.swt.examples/build.properties index b8b7472a209..e09a9354c4e 100644 --- a/examples/org.eclipse.swt.examples/build.properties +++ b/examples/org.eclipse.swt.examples/build.properties @@ -22,3 +22,6 @@ src.includes = about.html,\ doc-html/ source.. = src/ + +pom.model.groupId = org.eclipse.swt +tycho.pomless.parent = ../../local-build/local-build-parent diff --git a/examples/org.eclipse.swt.examples/pom.xml b/examples/org.eclipse.swt.examples/pom.xml deleted file mode 100644 index 7bfea2e24ad..00000000000 --- a/examples/org.eclipse.swt.examples/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.swt.localbuild - eclipse.platform.swt - 4.30.0-SNAPSHOT - ../../local-build/local-build-parent/ - - org.eclipse.swt - org.eclipse.swt.examples - 3.108.200-SNAPSHOT - eclipse-plugin - diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTableColumn.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTableColumn.java index 07af3a09c78..2542316a313 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTableColumn.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTableColumn.java @@ -473,7 +473,6 @@ int getX () { *
  • ERROR_WIDGET_DISPOSED - if the receiver has been disposed
    • *
  • ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
    • * - * */ public void pack () { checkWidget (); diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CanvasTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CanvasTab.java index c8112227eea..121c786d29e 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CanvasTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CanvasTab.java @@ -251,8 +251,6 @@ void resizeScrollBars () { /** * Scrolls the canvas horizontally. - * - * @param scrollBar */ void scrollHorizontal (ScrollBar scrollBar) { Rectangle bounds = canvas.getClientArea(); @@ -266,8 +264,6 @@ void scrollHorizontal (ScrollBar scrollBar) { /** * Scrolls the canvas vertically. - * - * @param scrollBar */ void scrollVertical (ScrollBar scrollBar) { Rectangle bounds = canvas.getClientArea(); diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GradientDialog.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GradientDialog.java index 14dec54fee3..01ee164237c 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GradientDialog.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GradientDialog.java @@ -248,7 +248,6 @@ public RGB getFirstRGB() { /** * Sets the first RGB. - * @param rgb */ public void setFirstRGB(RGB rgb) { this.rgb1 = rgb; @@ -263,7 +262,6 @@ public RGB getSecondRGB() { /** * Sets the second RGB. - * @param rgb */ public void setSecondRGB(RGB rgb) { this.rgb2 = rgb; diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GraphicsExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GraphicsExample.java index 68087492050..aa2d0ccbd98 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GraphicsExample.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GraphicsExample.java @@ -241,7 +241,6 @@ void recreateCanvas() { /** * Creates the control panel - * @param parent */ void createControlPanel(Composite parent) { Group group; diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet174.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet174.java index 9777d7f4bb2..534568279e7 100644 --- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet174.java +++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet174.java @@ -39,7 +39,6 @@ * @deprecated * This snippet is being deprecated as the org.eclipse.swt.opengl plugin it needs * is not available anymore. - * */ @Deprecated public class Snippet174 { diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet325.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet325.java index f26ceeefdeb..dea3a83937f 100644 --- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet325.java +++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet325.java @@ -18,7 +18,6 @@ * * For a list of all SWT example snippets see * http://www.eclipse.org/swt/snippets/ - * */ import org.eclipse.swt.*; import org.eclipse.swt.custom.*; diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet328.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet328.java index 9ba3d05318b..8ff4806fee7 100644 --- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet328.java +++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet328.java @@ -18,7 +18,6 @@ * * For a list of all SWT example snippets see * http://www.eclipse.org/swt/snippets/ - * */ import org.eclipse.swt.*; import org.eclipse.swt.custom.*; diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet380.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet380.java index d61b8a096e4..eaa2ce9c161 100644 --- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet380.java +++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet380.java @@ -23,7 +23,6 @@ /** * This shows the usage of the display in the executor framework in conjunction with a CompletableFuture - * */ public class Snippet380 { public static void main(String[] args) { diff --git a/features/org.eclipse.swt.tools.feature/feature.xml b/features/org.eclipse.swt.tools.feature/feature.xml index e2ce056a4f4..3e648e6edac 100644 --- a/features/org.eclipse.swt.tools.feature/feature.xml +++ b/features/org.eclipse.swt.tools.feature/feature.xml @@ -21,22 +21,14 @@ + version="0.0.0"/> + version="0.0.0"/> diff --git a/features/org.eclipse.swt.tools.feature/pom.xml b/features/org.eclipse.swt.tools.feature/pom.xml deleted file mode 100644 index 76dc1ebaedb..00000000000 --- a/features/org.eclipse.swt.tools.feature/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.swt - eclipse.platform.swt - 4.30.0-SNAPSHOT - ../../ - - org.eclipse.swt.tools.feature - org.eclipse.swt.tools.feature - 3.109.200-SNAPSHOT - eclipse-feature - - - - org.eclipse.tycho - tycho-source-plugin - - - package - feature-source - - feature-source - - - - - - org.eclipse.tycho - tycho-p2-plugin - - - attach-p2-metadata - package - - p2-metadata - - - - - - - diff --git a/pom.xml b/pom.xml index 6754ffa7736..65a6ade475c 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,6 @@ org.eclipse.tycho target-platform-configuration - ${tycho.version} @@ -180,6 +179,46 @@ + + generate-feature-source + + + feature.xml + + + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho.version} + + + package + feature-source + + feature-source + + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho.version} + + + attach-p2-metadata + package + + p2-metadata + + + + + + + diff --git a/tests/org.eclipse.swt.tests.cocoa/META-INF/MANIFEST.MF b/tests/org.eclipse.swt.tests.cocoa/META-INF/MANIFEST.MF index 62da4b35f74..4a38e987d5f 100644 --- a/tests/org.eclipse.swt.tests.cocoa/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.swt.tests.cocoa/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName +Bundle-Name: Eclipse SWT Tests Macos/cocoa Bundle-SymbolicName: org.eclipse.swt.tests.cocoa Bundle-Version: 3.108.0.qualifier -Bundle-Vendor: %providerName +Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.swt diff --git a/tests/org.eclipse.swt.tests.cocoa/build.properties b/tests/org.eclipse.swt.tests.cocoa/build.properties index 7f03bb2a4d0..8a441eca730 100644 --- a/tests/org.eclipse.swt.tests.cocoa/build.properties +++ b/tests/org.eclipse.swt.tests.cocoa/build.properties @@ -15,3 +15,11 @@ source..=JUnit Tests/ bin.includes = .,\ META-INF/ + +pom.model.groupId = org.eclipse.swt +tycho.pomless.parent = ../../local-build/local-build-parent +pom.model.packaging = eclipse-test-plugin +pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings} +# Skip all tests on build servers, because it contains platform specific code (overriden to false on platform-specific build machines) +pom.model.property.skipNativeTests = true +pom.model.property.skipTests = ${skipNativeTests} diff --git a/tests/org.eclipse.swt.tests.cocoa/pom.xml b/tests/org.eclipse.swt.tests.cocoa/pom.xml deleted file mode 100644 index ab75d6e63c4..00000000000 --- a/tests/org.eclipse.swt.tests.cocoa/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.swt.localbuild - eclipse.platform.swt - 4.30.0-SNAPSHOT - ../../local-build/local-build-parent/ - - org.eclipse.swt - org.eclipse.swt.tests.cocoa - 3.108.0-SNAPSHOT - eclipse-test-plugin - - ${tests.ignoredWarnings} - - - true - - - - - org.eclipse.tycho - tycho-surefire-plugin - - - ${skipNativeTests} - - - - - diff --git a/tests/org.eclipse.swt.tests.gtk/META-INF/MANIFEST.MF b/tests/org.eclipse.swt.tests.gtk/META-INF/MANIFEST.MF index 1423bcc3229..3b4aa1b1c9c 100644 --- a/tests/org.eclipse.swt.tests.gtk/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.swt.tests.gtk/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName +Bundle-Name: Eclipse SWT Tests Linux/gtk Bundle-SymbolicName: org.eclipse.swt.tests.gtk Bundle-Version: 3.109.0.qualifier -Bundle-Vendor: %providerName +Bundle-Vendor: Eclipse.org Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.swt Eclipse-BundleShape: dir diff --git a/tests/org.eclipse.swt.tests.gtk/build.properties b/tests/org.eclipse.swt.tests.gtk/build.properties index a4c1049159c..7c6462f5236 100644 --- a/tests/org.eclipse.swt.tests.gtk/build.properties +++ b/tests/org.eclipse.swt.tests.gtk/build.properties @@ -15,3 +15,11 @@ source.. = JUnit Tests/,\ ManualTests/ bin.includes = .,\ META-INF/ + +pom.model.groupId = org.eclipse.swt +tycho.pomless.parent = ../../local-build/local-build-parent +pom.model.packaging = eclipse-test-plugin +pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings} +# Skip all tests on build servers, because it contains platform specific code (overriden to false on platform-specific build machines) +pom.model.property.skipNativeTests = true +pom.model.property.skipTests = ${skipNativeTests} diff --git a/tests/org.eclipse.swt.tests.gtk/pom.xml b/tests/org.eclipse.swt.tests.gtk/pom.xml deleted file mode 100644 index eda242c7fa4..00000000000 --- a/tests/org.eclipse.swt.tests.gtk/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.swt.localbuild - eclipse.platform.swt - 4.30.0-SNAPSHOT - ../../local-build/local-build-parent/ - - org.eclipse.swt - org.eclipse.swt.tests.gtk - 3.109.0-SNAPSHOT - eclipse-test-plugin - - ${tests.ignoredWarnings} - - - true - - - - - org.eclipse.tycho - tycho-surefire-plugin - - ${skipNativeTests} - - - - - diff --git a/tests/org.eclipse.swt.tests.win32/META-INF/MANIFEST.MF b/tests/org.eclipse.swt.tests.win32/META-INF/MANIFEST.MF index 9fc97d8b7d5..5ca51b5ab5f 100644 --- a/tests/org.eclipse.swt.tests.win32/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.swt.tests.win32/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName +Bundle-Name: Eclipse SWT Tests Windows/win32 Bundle-SymbolicName: org.eclipse.swt.tests.win32 Bundle-Version: 3.108.0.qualifier -Bundle-Vendor: %providerName +Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.swt diff --git a/tests/org.eclipse.swt.tests.win32/build.properties b/tests/org.eclipse.swt.tests.win32/build.properties index 7f03bb2a4d0..f2ab10a3db3 100644 --- a/tests/org.eclipse.swt.tests.win32/build.properties +++ b/tests/org.eclipse.swt.tests.win32/build.properties @@ -15,3 +15,12 @@ source..=JUnit Tests/ bin.includes = .,\ META-INF/ + +pom.model.groupId = org.eclipse.swt +tycho.pomless.parent = ../../local-build/local-build-parent +pom.model.packaging = eclipse-test-plugin +pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings} +# Skip all tests on build servers, because it contains platform specific code (overriden to false on platform-specific build machines) +pom.model.property.skipNativeTests = true +pom.model.property.skipTests = ${skipNativeTests} +pom.model.property.testClass = org.eclipse.swt.tests.win32.AllWin32Tests diff --git a/tests/org.eclipse.swt.tests.win32/pom.xml b/tests/org.eclipse.swt.tests.win32/pom.xml deleted file mode 100644 index e8818d52801..00000000000 --- a/tests/org.eclipse.swt.tests.win32/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.swt.localbuild - eclipse.platform.swt - 4.30.0-SNAPSHOT - ../../local-build/local-build-parent/ - - org.eclipse.swt - org.eclipse.swt.tests.win32 - 3.108.0-SNAPSHOT - eclipse-test-plugin - - ${tests.ignoredWarnings} - - - true - - - - - org.eclipse.tycho - tycho-surefire-plugin - - ${skipNativeTests} - org.eclipse.swt.tests.win32.AllWin32Tests - - - - - diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageData.java index dc5b0609dba..abd5fa9e893 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageData.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageData.java @@ -60,11 +60,6 @@ public void setUp() { /** * Tests {@link ImageData#blit}: * creates a random image and tests over all combinations of depth,format,scale - * @throws InvocationTargetException - * @throws IllegalArgumentException - * @throws IllegalAccessException - * @throws SecurityException - * @throws NoSuchMethodException */ @Test public void test_blit() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { @@ -122,11 +117,6 @@ public void test_blit() throws NoSuchMethodException, SecurityException, Illegal /** * Tests {@link ImageData#blit}: * Ensures that (MSB_FIRST, LSB_FIRST) round trip produces original. - * @throws InvocationTargetException - * @throws IllegalArgumentException - * @throws IllegalAccessException - * @throws SecurityException - * @throws NoSuchMethodException */ @Test public void test_blit_MsbLsb() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_BorderLayout.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_BorderLayout.java index 454ecb0c928..dbbc6c7fa0f 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_BorderLayout.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_BorderLayout.java @@ -30,7 +30,6 @@ /** * Automated Test Suite for class {@link BorderLayout} - * */ public class Test_org_eclipse_swt_layout_BorderLayout { diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java index 337aad8fa6c..e119f1fd008 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java @@ -240,7 +240,6 @@ protected String getClassName() { * called for headless tests! * @param shell The shell to render. * @param durationMs duration in milliseconds. Method exits after duration. - * @throws InterruptedException */ protected void render(Shell shell, int durationMs) throws InterruptedException { long timestamp = System.currentTimeMillis(); diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/BenchmarkSwtMultithreading.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/BenchmarkSwtMultithreading.java index 73e5f699a4f..de30ba06586 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/BenchmarkSwtMultithreading.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/BenchmarkSwtMultithreading.java @@ -30,7 +30,6 @@ public class BenchmarkSwtMultithreading { * see https://github.com/eclipse-platform/eclipse.platform.swt/issues/74 * * @param args ignored - * @throws InterruptedException */ public static void main(String[] args) throws InterruptedException { final Display display = new Display(); diff --git a/tests/org.eclipse.swt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.swt.tests/META-INF/MANIFEST.MF index 754649ae686..68dc191c06f 100644 --- a/tests/org.eclipse.swt.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.swt.tests/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName +Bundle-Name: Eclipse SWT Tests Bundle-SymbolicName: org.eclipse.swt.tests Bundle-Version: 3.107.200.qualifier -Bundle-Vendor: %providerName +Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Export-Package: org.eclipse.swt.tests.junit, org.eclipse.swt.tests.junit.performance diff --git a/tests/org.eclipse.swt.tests/build.properties b/tests/org.eclipse.swt.tests/build.properties index b8ef7e06b5c..17746e02e6b 100644 --- a/tests/org.eclipse.swt.tests/build.properties +++ b/tests/org.eclipse.swt.tests/build.properties @@ -19,7 +19,6 @@ src.excludes = ManualTests/ bin.includes = .,\ test.xml,\ about.html,\ - plugin.properties,\ data/,\ META-INF/ diff --git a/tests/org.eclipse.swt.tests/plugin.properties b/tests/org.eclipse.swt.tests/plugin.properties deleted file mode 100644 index 6646f1efe98..00000000000 --- a/tests/org.eclipse.swt.tests/plugin.properties +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2003 IBM Corporation and others. -# -# This program and the accompanying materials -# are made available under the terms of the Eclipse Public License 2.0 -# which accompanies this distribution, and is available at -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -pluginName = Tests -providerName = Eclipse.org \ No newline at end of file