Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into issue_882_reproducer
Browse files Browse the repository at this point in the history
  • Loading branch information
basilevs committed Nov 11, 2023
2 parents 72210df + eafdfbd commit 3fec26b
Show file tree
Hide file tree
Showing 126 changed files with 161 additions and 685 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
bin/
*.log
target/
.polyglot.*
pom.tycho
9 changes: 9 additions & 0 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<extensions>
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>4.0.4</version>
</extension>
</extensions>
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
'''
}
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt.tools.base/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions bundles/org.eclipse.swt.tools.base/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
24 changes: 0 additions & 24 deletions bundles/org.eclipse.swt.tools.base/pom.xml

This file was deleted.

4 changes: 2 additions & 2 deletions bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)"
3 changes: 3 additions & 0 deletions bundles/org.eclipse.swt.tools.spies/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
24 changes: 0 additions & 24 deletions bundles/org.eclipse.swt.tools.spies/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
*
* Modify the main method below to launch your application.
* Run Sleak.
*
*/
public class Sleak {
List list;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

/**
* Interface containing constants for the Spies plug-in.
*
*/

public interface SpiesConstants {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
18 changes: 18 additions & 0 deletions bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@
<value>remoteURI</value>
</detail>
</annotation>
<configSections
name="branch">
<properties
key="autoSetupRebase"
value="always"/>
</configSections>
<description>Platform SWT</description>
</setupTask>
<setupTask
Expand Down Expand Up @@ -75,6 +81,12 @@
<value>remoteURI</value>
</detail>
</annotation>
<configSections
name="branch">
<properties
key="autoSetupRebase"
value="always"/>
</configSections>
<description>Platform SWT</description>
</setupTask>
<setupTask
Expand Down Expand Up @@ -252,6 +264,12 @@
<value>remoteURI</value>
</detail>
</annotation>
<configSections
name="branch">
<properties
key="autoSetupRebase"
value="always"/>
</configSections>
<description>SWT Website</description>
</setupTask>
<setupTask
Expand Down
3 changes: 3 additions & 0 deletions bundles/org.eclipse.swt.tools/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@ source.. = src/,\
JavadocBasher/
src.includes = about.html
bin.excludes = META-INF/p2.inf

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
24 changes: 0 additions & 24 deletions bundles/org.eclipse.swt.tools/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ public class CBanner extends Composite {
* @exception SWTException <ul>
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
* </ul>
*
*/
public CBanner(Composite parent, int style) {
super(parent, checkStyle(style));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,6 @@ ToolBar getChevron() {
* <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*
*/
/*public*/ boolean getChevronVisible() {
checkWidget();
Expand Down Expand Up @@ -4176,7 +4175,6 @@ int getWrappedHeight (Point size) {
* <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
* <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
* </ul>
*
*/
/*public*/ void setChevronVisible(boolean visible) {
checkWidget();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Integer> computeModifiedLines(int[] referenceRanges, StyleRange[] referenceStyles, int[] newRanges, StyleRange[] newStyles) {
if (referenceStyles == null) {
Expand Down Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
import org.eclipse.swt.graphics.*;
import org.eclipse.swt.widgets.*;

/**
*
*/
class StyledTextEvent extends Event {
// used by LineStyleEvent
int[] ranges;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import org.eclipse.swt.widgets.*;

class StyledTextListener extends TypedListener {
/**
*/
StyledTextListener(SWTEventListener listener) {
super(listener);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ public void getName(AccessibleEvent e) {
* @see SelectionListener
* @see SelectionEvent
* @see #removeSelectionListener(SelectionListener)
*
*/
public void addSelectionListener(SelectionListener listener) {
checkWidget();
Expand Down Expand Up @@ -626,7 +625,6 @@ public void setForeground (Color color) {
* <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*
*/
public void setSelection(int row, int column) {
checkWidget();
Expand All @@ -649,7 +647,6 @@ public void setSelection(int row, int column) {
* <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*
*/
public void setSelection(TableItem row, int column) {
checkWidget();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
* <p>After the drop has completed successfully or has been aborted, the application which defines the
* <code>DragSource</code> is required to take the appropriate cleanup action. In the case of a successful
* <b>move</b> operation, the application must remove the data that was transferred.</p>
*
*/
public interface DragSourceListener extends SWTEventListener {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
* operation that is performed but the data type is fixed.</p>
*
* @see DropTargetEvent
*
*/
public interface DropTargetListener extends SWTEventListener {

Expand Down
Loading

0 comments on commit 3fec26b

Please sign in to comment.