From 73effbb551991b691836400184161242dc488fb8 Mon Sep 17 00:00:00 2001 From: John Bampton Date: Tue, 27 May 2025 08:48:42 +1000 Subject: [PATCH 1/2] misc: fix spelling --- .../gtk/clone_build_gtk_debug.sh | 6 +++--- .../org/eclipse/swt/browser/WebBrowser.java | 6 +++--- .../gtk/org/eclipse/swt/widgets/Table.java | 2 +- .../gtk/org/eclipse/swt/widgets/Tree.java | 2 +- docs/gtk-dev-guide.md | 12 ++++++------ .../swt/examples/launcher/SplitLayout.java | 2 +- .../swt/examples/ole/win32/OLEExample.java | 4 ++-- .../swt/examples/ole/win32/OleWebBrowser.java | 4 ++-- .../swt/examples/graphics/GraphicsExample.java | 2 +- .../eclipse/swt/examples/texteditor/text.txt | 18 +++++++++--------- tests/build.properties | 2 +- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/bundles/org.eclipse.swt.tools/gtk/clone_build_gtk_debug.sh b/bundles/org.eclipse.swt.tools/gtk/clone_build_gtk_debug.sh index 5806cb6036d..cbb30021577 100755 --- a/bundles/org.eclipse.swt.tools/gtk/clone_build_gtk_debug.sh +++ b/bundles/org.eclipse.swt.tools/gtk/clone_build_gtk_debug.sh @@ -105,7 +105,7 @@ func_echo_info "You are in: $(pwd)" if [ "$SILENT" == "false" ]; then func_echo_input "Currently gtk is on branch:" git branch - func_echo_input "Its reccomended to checkout a version of GTK that + func_echo_input "Its recommended to checkout a version of GTK that is found on your system, because 'master' usually requires very new upstream libraries. To find out which version of Gtk3 is on your system, you can check your package manager. Ex on fedora: sudo dnf list installed | grep '^gtk3\.' @@ -114,7 +114,7 @@ To checkout a particular gtk branch: git branch -r | grep gtk-3 git checkout origin/gtk-3-22 Shall I continue (y)? (You can checkout the required branch in another terminal tab. -(To avoid seesing this message, try running this script with '-y'" +(To avoid seeing this message, try running this script with '-y'" read -p "[y/n]: " if [ ! "$REPLY" == y ]; then @@ -127,7 +127,7 @@ fi cd "$GTK_SRC_DIR" if [ "$NOCLEANUP" == false ]; then func_echo_info "Cleanup old gtk build files. - This is needed if switching between gtk version to avoid compiliation issues." + This is needed if switching between gtk version to avoid compilation issues." git clean -xdf # remove build files. git reset --hard # undo changes to existing source files. else diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java index 6d1eef30a98..e0f0a0c7532 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java @@ -368,8 +368,8 @@ public void createFunction (BrowserFunction function) { } /** - * Designed to be overriden. - * @return javaScrit code that defines the 'callJava' syntax for javascript. + * Designed to be overridden. + * @return javaScript code that defines the 'callJava' syntax for javascript. */ String getJavaCallDeclaration() { return "if (!window.callJava) {\n" @@ -393,7 +393,7 @@ public void destroyFunction (BrowserFunction function) { deregisterFunction (function); } -// Designed to be overriden by platform implementations, used for optimization and avoiding deadlocks. +// Designed to be overridden by platform implementations, used for optimization and avoiding deadlocks. // Webkit2 is async, we often don't need to bother waiting for a return type if we never use it. void nonBlockingExecute(String script) { execute(script); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java index 2e358c828a0..55e8cc4f511 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java @@ -3649,7 +3649,7 @@ public void setItemCount (int count) { */ public void setLinesVisible (boolean show) { checkWidget(); - //Note: this is overriden by the active theme in GTK3. + //Note: this is overridden by the active theme in GTK3. GTK.gtk_tree_view_set_grid_lines (handle, show ? GTK.GTK_TREE_VIEW_GRID_LINES_VERTICAL : GTK.GTK_TREE_VIEW_GRID_LINES_NONE); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java index 073f3882754..d1642335dff 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java @@ -3818,7 +3818,7 @@ public void setHeaderVisible (boolean show) { */ public void setLinesVisible (boolean show) { checkWidget(); - //Note: this is overriden by the active theme in GTK3. + //Note: this is overridden by the active theme in GTK3. GTK.gtk_tree_view_set_grid_lines (handle, show ? GTK.GTK_TREE_VIEW_GRID_LINES_VERTICAL : GTK.GTK_TREE_VIEW_GRID_LINES_NONE); } diff --git a/docs/gtk-dev-guide.md b/docs/gtk-dev-guide.md index c934898d3e4..8e88c1cf291 100644 --- a/docs/gtk-dev-guide.md +++ b/docs/gtk-dev-guide.md @@ -196,7 +196,7 @@ You should learn at least: Widget is the main Widget. Everything else extends Widget. The most interesting classes are Widget, Control and Composite. Most widgets fork off of these. -As such, it is useful to be aware of fields/methods in parent classes and which methods get overriden by children. In Eclipse, you can Ctrl+click on a method to see it's super implementation, or derived implementations (this is very useful). +As such, it is useful to be aware of fields/methods in parent classes and which methods get overridden by children. In Eclipse, you can Ctrl+click on a method to see it's super implementation, or derived implementations (this is very useful). This list below shows the widget hierarchy: @@ -281,11 +281,11 @@ These are typically wrapped in a lock: **Constants and ENUMS** -C constants and C Enums are delcared as plain ints. like so: +C constants and C Enums are declared as plain ints. like so: public static final int GTK_SCROLL_STEP_UP = 6; -*Note: If you need to add a C enum to OS.java, C ENUMS (Enumirations) begin at 0. Do note, that the Javadoc is parsed by the JNI parser. So be careful about what you put in there.* +*Note: If you need to add a C enum to OS.java, C ENUMS (Enumerations) begin at 0. Do note, that the Javadoc is parsed by the JNI parser. So be careful about what you put in there.* **Static Strings translated to C-bytes** @@ -441,7 +441,7 @@ C enums don't map onto Java's enums. Instead, to add an enum like GtkAlign to OS public static final int GTK_ALIGN_CENTER = 3; public static final int GTK_ALIGN_BASELINE = 4; -And when you declare a function, delcare the java-doc parameter cast like this: +And when you declare a function, declare the java-doc parameter cast like this: @param gtkalign cast=(GtkAlign) // note (GtkAlign) with no pointer, not (GtkAlign *) @@ -878,7 +878,7 @@ Now click on OK. Right click on your project -> Indexer -> Rebuild index. Now yo **Debugging GTK applications** -Besides stepping through a GTK appliction, you also use the GtkInspector, which can be ran for a GTK3.14+ application to see real-time information about your running GTK application. +Besides stepping through a GTK application, you also use the GtkInspector, which can be ran for a GTK3.14+ application to see real-time information about your running GTK application. You can set launch flags to help debug GTK apps as well as SWT snippets. Set the following global variable to get detailed frame-sizes: @@ -935,7 +935,7 @@ Inside the GTK code base somewhere, set a break point in a common area: gtkmain.c:gtk_main_do_event(GdkEvent *event) #This will be triggered an almost every GDK event -Launch your SWT application. In terminal execute jps (java proccesses) and identify the PID of your SWT appplication. +Launch your SWT application. In terminal execute jps (java processes) and identify the PID of your SWT application. lufimtse@unused-10-15-18-183 pathscripts$ jps 357 Jps diff --git a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/SplitLayout.java b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/SplitLayout.java index c92d64042e2..f48281fd800 100644 --- a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/SplitLayout.java +++ b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/SplitLayout.java @@ -20,7 +20,7 @@ /** * A Layout class that automatically switches from a horizontal split to a vertical - * split layout to accomodate changing size conditions. + * split layout to accommodate changing size conditions. * * Later on we might improve this class to take into account the "preferred" size of * the widgets. diff --git a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OLEExample.java b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OLEExample.java index 0e7ea33c97c..2373f748eda 100644 --- a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OLEExample.java +++ b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OLEExample.java @@ -159,8 +159,8 @@ void fileOpen() { OleAutomation player = new OleAutomation(clientSite); int playURL[] = player.getIDsOfNames(new String[] { "URL" }); if (playURL != null) { - boolean suceeded = player.setProperty(playURL[0], new Variant(fileName)); - if (!suceeded) + boolean succeeded = player.setProperty(playURL[0], new Variant(fileName)); + if (!succeeded) disposeClient(); } else { disposeClient(); diff --git a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleWebBrowser.java b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleWebBrowser.java index a51d60a0023..e8f8756b619 100644 --- a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleWebBrowser.java +++ b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleWebBrowser.java @@ -56,7 +56,7 @@ class OleWebBrowser { public static final int FrameBeforeNavigate = 200; // Fired when a new hyperlink is being navigated to in a frame. public static final int FrameNavigateComplete = 201; // Fired when a new hyperlink is being navigated to in a frame. public static final int FrameNewWindow = 204; // Fired when a new window should be created. - public static final int Quit = 103; // Fired when application is quiting. + public static final int Quit = 103; // Fired when application is quitting. public static final int WindowMove = 109; // Fired when window has been moved. public static final int WindowResize = 110; // Fired when window has been sized. public static final int WindowActivate = 111; // Fired when window has been activated. @@ -217,7 +217,7 @@ public void Refresh(){ } /** - * Aborts loading of the currnet page. + * Aborts loading of the current page. */ public void Stop() { // dispid=106, type=METHOD, name="Stop" 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 348fa377ed7..6b7e32358b4 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 @@ -557,7 +557,7 @@ public void redraw() { } /** - * Sets wheter the canvas is double buffered or not. + * Sets whether the canvas is double buffered or not. */ public void setDoubleBuffered(boolean doubleBuffered) { dbItem.setSelection(doubleBuffered); diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/texteditor/text.txt b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/texteditor/text.txt index 6e6b58282b0..4ecf3db41a3 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/texteditor/text.txt +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/texteditor/text.txt @@ -142,7 +142,7 @@ public class StyledText extends Canvas { Color foreground = null; // Clipboard clipboard; boolean mouseDown = false; - boolean mouseDoubleClick = false; // true=a double click ocurred. Don't do mouse swipe selection. + boolean mouseDoubleClick = false; // true=a double click occurred. Don't do mouse swipe selection. int autoScrollDirection = SWT.NULL; // the direction of autoscrolling (up, down, right, left) int autoScrollDistance = 0; int lastTextChangeStart; // cache data of the @@ -857,7 +857,7 @@ public class StyledText extends Canvas { writeStyledLine(line, lineOffset, styles, lineBackground); } /** - * Appends the specified line delmimiter to the RTF data. + * Appends the specified line delimiter to the RTF data. *

* * @param lineDelimiter line delimiter to write as RTF. @@ -1124,7 +1124,7 @@ public class StyledText extends Canvas { } } /** - * Appends the specified line delmimiter to the data. + * Appends the specified line delimiter to the data. *

* * @param lineDelimiter line delimiter to write @@ -1290,7 +1290,7 @@ public class StyledText extends Canvas { return rect.x + rect.width + leftMargin + rightMargin; } /** - * Grows the lineWidth array to accomodate new line width + * Grows the lineWidth array to accommodate new line width * information. *

* @@ -2840,8 +2840,8 @@ void doMouseSelection() { /** * Returns the offset of the word at the specified offset. * If the current selection extends from high index to low index - * (i.e., right to left, or caret is at left border of selecton on - * non-bidi platforms) the start offset of the word preceeding the + * (i.e., right to left, or caret is at left border of selection on + * non-bidi platforms) the start offset of the word preceding the * selection is returned. If the current selection extends from * low index to high index the end offset of the word following * the selection is returned. @@ -3810,7 +3810,7 @@ public int getLineHeight() { /** * Returns a LineCache implementation. Depending on whether or not * word wrap is on this may be a line wrapping or line width - * calculating implementaiton. + * calculating implementation. *

* * @param content StyledTextContent to create the LineCache on. @@ -7764,7 +7764,7 @@ void showCaret(int caretLine) { * Scrolls the specified offset into view. *

* - * @param offset offset that should be scolled into view + * @param offset offset that should be scrolled into view */ void showOffset(int offset) { int line = content.getLineAtOffset(offset); @@ -7902,7 +7902,7 @@ void wordWrapResize(int oldClientAreaWidth) { newTopIndex = content.getLineAtOffset(topOffset); // topOffset is the beginning of the top line. therefore it // needs to be adjusted because in a wrapped line this is also - // the end of the preceeding line. + // the end of the preceding line. if (newTopIndex < content.getLineCount() - 1 && topOffset == content.getOffsetAtLine(newTopIndex + 1)) { newTopIndex++; diff --git a/tests/build.properties b/tests/build.properties index 17551236130..f94e1042812 100644 --- a/tests/build.properties +++ b/tests/build.properties @@ -16,6 +16,6 @@ tycho.pomless.parent = ../local-build/local-build-parent pom.model.artifactId = swt-tests 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) +# Skip all tests on build servers, because it contains platform specific code (overridden to false on platform-specific build machines) pom.model.property.skipNativeTests = true pom.model.property.skipTests = ${skipNativeTests} From 645a74a0fd92f102b15f6e324d1008ebfc99e697 Mon Sep 17 00:00:00 2001 From: Aleksandar Kurtakov Date: Wed, 18 Jun 2025 09:09:31 +0300 Subject: [PATCH 2/2] Version bumps for new stream --- bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF | 2 +- examples/org.eclipse.swt.examples.launcher/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.swt.examples.ole.win32/META-INF/MANIFEST.MF | 2 +- examples/org.eclipse.swt.examples.ole.win32/pom.xml | 2 +- features/org.eclipse.swt.tools.feature/feature.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF index 6ef829656d3..8e889fffa57 100644 --- a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.swt.tools; singleton:=true -Bundle-Version: 3.110.700.qualifier +Bundle-Version: 3.110.800.qualifier Bundle-ManifestVersion: 2 Export-Package: org.eclipse.swt.tools.internal; x-internal:=true Bundle-ActivationPolicy: lazy 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 f04bddafd39..19c803db13e 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.500.qualifier +Bundle-Version: 3.108.600.qualifier Bundle-Activator: org.eclipse.swt.examples.launcher.LauncherPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/examples/org.eclipse.swt.examples.ole.win32/META-INF/MANIFEST.MF b/examples/org.eclipse.swt.examples.ole.win32/META-INF/MANIFEST.MF index b53c6e801a6..36e963f389a 100644 --- a/examples/org.eclipse.swt.examples.ole.win32/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.swt.examples.ole.win32/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.SWTOLEExample.name Bundle-SymbolicName: org.eclipse.swt.examples.ole.win32; singleton:=true -Bundle-Version: 3.109.300.qualifier +Bundle-Version: 3.109.400.qualifier Bundle-Activator: org.eclipse.swt.examples.ole.win32.OlePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/examples/org.eclipse.swt.examples.ole.win32/pom.xml b/examples/org.eclipse.swt.examples.ole.win32/pom.xml index ecac8a9be8b..96afafbf3fc 100644 --- a/examples/org.eclipse.swt.examples.ole.win32/pom.xml +++ b/examples/org.eclipse.swt.examples.ole.win32/pom.xml @@ -20,7 +20,7 @@ ../../ org.eclipse.swt.examples.ole.win32 - 3.109.300-SNAPSHOT + 3.109.400-SNAPSHOT eclipse-plugin diff --git a/features/org.eclipse.swt.tools.feature/feature.xml b/features/org.eclipse.swt.tools.feature/feature.xml index df4b0b6849e..145eb4e15b4 100644 --- a/features/org.eclipse.swt.tools.feature/feature.xml +++ b/features/org.eclipse.swt.tools.feature/feature.xml @@ -2,7 +2,7 @@