From 9e1bbbab0059e39e3c36fb7038612634974abfff Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sat, 27 Jan 2024 21:50:56 +0100 Subject: [PATCH] Link java sources into native fragments to compile them there in the IDE For each native SWT fragment link the source-folders containing the java classes used in that native fragment into said fragment's Eclipse project. This allows to compile the java classes within the fragment project already in the development workspace and consequently to develop and test the code in the workspace using the same structure as the built artifacts. If desired, the code of multiple/all fragments can be checked-out and compiled at the same time, just by opening all desired fragment projects. The sources still reside within the org.eclipse.swt main/host bundle but are not compiled there anymore in the dev-workspace. This allows to share common code while defining it only once at a central location. Also move the shared preferences into the 'binaries/.setting' folder and link it as '.settings' folder in each native fragment. This allows to share the same settings in all fragment projects, while defining them only once, just like the code. Previously within the IDE workspace, the SWT java-sources for a platform have been compiled within the org.eclipse.swt project using a .classpath file specially crafted for each supported window-system/platform. Therefore when checking out the SWT sources in the IDE one had to rename the '.classpath_${ws}' template for the desired platform to '.classpath' to use it locally. With this change this renaming is not necessary anymore. Furthermore ignore all 'Restrictions' type API problem, since SWT does only reference its own internal classes. Because SWT does not have external dependencies internals of other bundles cannot be referenced. Ignoring these kind of problems avoids the need to add filters to suppress them. Furthermore this change allows PDE API-Tools to remove the built-in special handling of the org.eclipse.swt setup because now the API baseline check within the IDE can happen simply in the fragment as it exists in the baseline. --- .../.classpath_cocoa | 7 +- .../.classpath_gtk | 9 +- .../.classpath_win32 | 7 +- .../org.eclipse.core.resources.prefs | 0 binaries/.settings/org.eclipse.jdt.core.prefs | 132 +++++ .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.pde.api.tools.prefs | 10 +- .../.project | 84 ++++ .../.project | 86 +++- .../org.eclipse.core.resources.prefs | 2 - .../.project | 84 ++++ .../org.eclipse.core.resources.prefs | 2 - .../.project | 84 ++++ .../org.eclipse.core.resources.prefs | 2 - .../.project | 84 ++++ .../org.eclipse.core.resources.prefs | 2 - .../org.eclipse.swt.gtk.linux.x86_64/.project | 84 ++++ .../org.eclipse.core.resources.prefs | 2 - .../.project | 84 ++++ .../org.eclipse.core.resources.prefs | 2 - .../org/eclipse/swt/tools/internal/Sleak.java | 1 + .../Oomph/platformSwt.setup | 12 - bundles/org.eclipse.swt/.classpath | 5 + .../org.eclipse.swt/.classpath_cocoa_aarch64 | 34 -- bundles/org.eclipse.swt/.gitignore | 4 - bundles/org.eclipse.swt/.project | 6 - .../org.eclipse.swt/.settings/.api_filters | 467 ------------------ .../.settings/org.eclipse.jdt.core.prefs | 117 ----- bundles/org.eclipse.swt/META-INF/MANIFEST.MF | 16 - bundles/org.eclipse.swt/Readme.Linux.md | 7 +- bundles/org.eclipse.swt/Readme.Win32.md | 2 - bundles/org.eclipse.swt/Readme.macOS.md | 2 - bundles/org.eclipse.swt/Readme.md | 20 +- .../build-scripts/CollectSources.java | 15 +- 34 files changed, 746 insertions(+), 729 deletions(-) rename bundles/org.eclipse.swt/.classpath_cocoa_x86_64 => binaries/.classpath_cocoa (85%) rename {bundles/org.eclipse.swt => binaries}/.classpath_gtk (82%) rename {bundles/org.eclipse.swt => binaries}/.classpath_win32 (82%) rename binaries/{org.eclipse.swt.cocoa.macosx.aarch64 => }/.settings/org.eclipse.core.resources.prefs (100%) create mode 100644 binaries/.settings/org.eclipse.jdt.core.prefs rename {bundles/org.eclipse.swt => binaries}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {bundles/org.eclipse.swt => binaries}/.settings/org.eclipse.pde.api.tools.prefs (97%) delete mode 100644 binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/org.eclipse.core.resources.prefs delete mode 100644 binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/org.eclipse.core.resources.prefs delete mode 100644 binaries/org.eclipse.swt.gtk.linux.loongarch64/.settings/org.eclipse.core.resources.prefs delete mode 100644 binaries/org.eclipse.swt.gtk.linux.ppc64le/.settings/org.eclipse.core.resources.prefs delete mode 100644 binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/org.eclipse.core.resources.prefs delete mode 100644 binaries/org.eclipse.swt.win32.win32.x86_64/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/org.eclipse.swt/.classpath delete mode 100644 bundles/org.eclipse.swt/.classpath_cocoa_aarch64 delete mode 100644 bundles/org.eclipse.swt/.settings/.api_filters diff --git a/bundles/org.eclipse.swt/.classpath_cocoa_x86_64 b/binaries/.classpath_cocoa similarity index 85% rename from bundles/org.eclipse.swt/.classpath_cocoa_x86_64 rename to binaries/.classpath_cocoa index b323077f02b..7173e0ab710 100644 --- a/bundles/org.eclipse.swt/.classpath_cocoa_x86_64 +++ b/binaries/.classpath_cocoa @@ -8,11 +8,7 @@ - - - - - + @@ -29,6 +25,5 @@ - diff --git a/bundles/org.eclipse.swt/.classpath_gtk b/binaries/.classpath_gtk similarity index 82% rename from bundles/org.eclipse.swt/.classpath_gtk rename to binaries/.classpath_gtk index b83802978e0..04340c2700f 100644 --- a/bundles/org.eclipse.swt/.classpath_gtk +++ b/binaries/.classpath_gtk @@ -5,13 +5,9 @@ - + - - - - - + @@ -31,6 +27,5 @@ - diff --git a/bundles/org.eclipse.swt/.classpath_win32 b/binaries/.classpath_win32 similarity index 82% rename from bundles/org.eclipse.swt/.classpath_win32 rename to binaries/.classpath_win32 index 4cf3f176dbc..0b9e7bc35eb 100644 --- a/bundles/org.eclipse.swt/.classpath_win32 +++ b/binaries/.classpath_win32 @@ -4,11 +4,7 @@ - - - - - + @@ -25,6 +21,5 @@ - diff --git a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/org.eclipse.core.resources.prefs b/binaries/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/org.eclipse.core.resources.prefs rename to binaries/.settings/org.eclipse.core.resources.prefs diff --git a/binaries/.settings/org.eclipse.jdt.core.prefs b/binaries/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..ee1fd8be6de --- /dev/null +++ b/binaries/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,132 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 diff --git a/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.ui.prefs b/binaries/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from bundles/org.eclipse.swt/.settings/org.eclipse.jdt.ui.prefs rename to binaries/.settings/org.eclipse.jdt.ui.prefs diff --git a/bundles/org.eclipse.swt/.settings/org.eclipse.pde.api.tools.prefs b/binaries/.settings/org.eclipse.pde.api.tools.prefs similarity index 97% rename from bundles/org.eclipse.swt/.settings/org.eclipse.pde.api.tools.prefs rename to binaries/.settings/org.eclipse.pde.api.tools.prefs index dfc542e6e45..9ca47470c1b 100644 --- a/bundles/org.eclipse.swt/.settings/org.eclipse.pde.api.tools.prefs +++ b/binaries/.settings/org.eclipse.pde.api.tools.prefs @@ -46,11 +46,11 @@ FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error -ILLEGAL_EXTEND=Error -ILLEGAL_IMPLEMENT=Error -ILLEGAL_INSTANTIATE=Error -ILLEGAL_OVERRIDE=Error -ILLEGAL_REFERENCE=Error +ILLEGAL_EXTEND=Ignore +ILLEGAL_IMPLEMENT=Ignore +ILLEGAL_INSTANTIATE=Ignore +ILLEGAL_OVERRIDE=Ignore +ILLEGAL_REFERENCE=Ignore INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error diff --git a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.project b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.project index 7d12b551f44..b1330c9f98c 100644 --- a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.project +++ b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_cocoa + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + diff --git a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.project b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.project index a132c296bc3..f3372f54364 100644 --- a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.project +++ b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature - \ No newline at end of file + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_cocoa + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + + diff --git a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/org.eclipse.core.resources.prefs b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/binaries/org.eclipse.swt.gtk.linux.aarch64/.project b/binaries/org.eclipse.swt.gtk.linux.aarch64/.project index 7fce5f98971..c0a9b96b52d 100644 --- a/binaries/org.eclipse.swt.gtk.linux.aarch64/.project +++ b/binaries/org.eclipse.swt.gtk.linux.aarch64/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_gtk + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + diff --git a/binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/org.eclipse.core.resources.prefs b/binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/binaries/org.eclipse.swt.gtk.linux.loongarch64/.project b/binaries/org.eclipse.swt.gtk.linux.loongarch64/.project index 93f7e669b0c..f6bf0b29215 100644 --- a/binaries/org.eclipse.swt.gtk.linux.loongarch64/.project +++ b/binaries/org.eclipse.swt.gtk.linux.loongarch64/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_gtk + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + diff --git a/binaries/org.eclipse.swt.gtk.linux.loongarch64/.settings/org.eclipse.core.resources.prefs b/binaries/org.eclipse.swt.gtk.linux.loongarch64/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/binaries/org.eclipse.swt.gtk.linux.loongarch64/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/binaries/org.eclipse.swt.gtk.linux.ppc64le/.project b/binaries/org.eclipse.swt.gtk.linux.ppc64le/.project index 0f8f65b3189..13d500587de 100644 --- a/binaries/org.eclipse.swt.gtk.linux.ppc64le/.project +++ b/binaries/org.eclipse.swt.gtk.linux.ppc64le/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_gtk + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + diff --git a/binaries/org.eclipse.swt.gtk.linux.ppc64le/.settings/org.eclipse.core.resources.prefs b/binaries/org.eclipse.swt.gtk.linux.ppc64le/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/binaries/org.eclipse.swt.gtk.linux.ppc64le/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/binaries/org.eclipse.swt.gtk.linux.x86_64/.project b/binaries/org.eclipse.swt.gtk.linux.x86_64/.project index 79c840e77d7..8d72a47523d 100644 --- a/binaries/org.eclipse.swt.gtk.linux.x86_64/.project +++ b/binaries/org.eclipse.swt.gtk.linux.x86_64/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_gtk + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + diff --git a/binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/org.eclipse.core.resources.prefs b/binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/binaries/org.eclipse.swt.win32.win32.x86_64/.project b/binaries/org.eclipse.swt.win32.win32.x86_64/.project index 02ef08afd13..d086a9b2687 100644 --- a/binaries/org.eclipse.swt.win32.win32.x86_64/.project +++ b/binaries/org.eclipse.swt.win32.win32.x86_64/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_win32 + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + diff --git a/binaries/org.eclipse.swt.win32.win32.x86_64/.settings/org.eclipse.core.resources.prefs b/binaries/org.eclipse.swt.win32.win32.x86_64/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/binaries/org.eclipse.swt.win32.win32.x86_64/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 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 c4127aa2318..883dcffb9e9 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 @@ -32,6 +32,7 @@ * Modify the main method below to launch your application. * Run Sleak. */ +@SuppressWarnings("restriction") public class Sleak { List list; Canvas canvas; diff --git a/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup b/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup index 3f6e82597f5..3de35532ec7 100644 --- a/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup +++ b/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup @@ -46,18 +46,6 @@ Platform SWT - - + + + + diff --git a/bundles/org.eclipse.swt/.classpath_cocoa_aarch64 b/bundles/org.eclipse.swt/.classpath_cocoa_aarch64 deleted file mode 100644 index 07440032859..00000000000 --- a/bundles/org.eclipse.swt/.classpath_cocoa_aarch64 +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.eclipse.swt/.gitignore b/bundles/org.eclipse.swt/.gitignore index 867253bf3c8..c2120c4501e 100644 --- a/bundles/org.eclipse.swt/.gitignore +++ b/bundles/org.eclipse.swt/.gitignore @@ -1,5 +1 @@ -.classpath -ws/ -.build64/ -.buildas/ /bin_build/ diff --git a/bundles/org.eclipse.swt/.project b/bundles/org.eclipse.swt/.project index 56e0eb7b6a4..04d42104585 100644 --- a/bundles/org.eclipse.swt/.project +++ b/bundles/org.eclipse.swt/.project @@ -20,11 +20,6 @@ - - org.eclipse.pde.api.tools.apiAnalysisBuilder - - - org.eclipse.swt.tools.jnibuilder @@ -34,6 +29,5 @@ org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature - org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/bundles/org.eclipse.swt/.settings/.api_filters b/bundles/org.eclipse.swt/.settings/.api_filters deleted file mode 100644 index 715f2c17428..00000000000 --- a/bundles/org.eclipse.swt/.settings/.api_filters +++ /dev/null @@ -1,467 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs index ee1fd8be6de..9478cb16537 100644 --- a/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs @@ -1,14 +1,4 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 @@ -17,116 +7,9 @@ org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 diff --git a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF index 2532d5f2ff6..f9ba502224d 100644 --- a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF @@ -6,22 +6,6 @@ Bundle-Version: 3.125.0.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: plugin DynamicImport-Package: org.eclipse.swt.accessibility2 -Export-Package: - org.eclipse.swt, - org.eclipse.swt.accessibility, - org.eclipse.swt.awt, - org.eclipse.swt.browser, - org.eclipse.swt.custom, - org.eclipse.swt.dnd, - org.eclipse.swt.events, - org.eclipse.swt.graphics, - org.eclipse.swt.internal;x-friends:="org.eclipse.ui,org.eclipse.swt.tools.spies", - org.eclipse.swt.internal.image;x-internal:=true, - org.eclipse.swt.layout, - org.eclipse.swt.opengl, - org.eclipse.swt.printing, - org.eclipse.swt.program, - org.eclipse.swt.widgets Eclipse-ExtensibleAPI: true Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.swt diff --git a/bundles/org.eclipse.swt/Readme.Linux.md b/bundles/org.eclipse.swt/Readme.Linux.md index 674c0b73b50..6fe1c42b54d 100644 --- a/bundles/org.eclipse.swt/Readme.Linux.md +++ b/bundles/org.eclipse.swt/Readme.Linux.md @@ -30,11 +30,10 @@ You need to install the following on your system: ### Building and Testing locally -Import and build the SWT project `bundles/org.eclipse.swt` in Eclipse. See the -platform independent Readme for how to set the .classpath. This will populate -the `bundles/org.eclipse.swt/bin/library` with the native code and build files. +Import and build the SWT project `bundles/org.eclipse.swt` and `binaries/org.eclipse.swt.gtk.linux.${arch}` in Eclipse. -To build SWT natives run the `build.sh` script in `./bin/library` directory. To +To build SWT natives run the `Build-SWT-native-binaries-for-running-platform` Maven launch configuration. +Alternatively run the `build.sh` script in `binaries/org.eclipse.swt.gtk.linux.${arch}/bin/library` directory. To use the locally build natives run the build script with the 'install' argument (`./build.sh install`) or --help to see more options. diff --git a/bundles/org.eclipse.swt/Readme.Win32.md b/bundles/org.eclipse.swt/Readme.Win32.md index 5430a1b9b40..e47fc6d3a59 100644 --- a/bundles/org.eclipse.swt/Readme.Win32.md +++ b/bundles/org.eclipse.swt/Readme.Win32.md @@ -27,8 +27,6 @@ libraries in the binary repository. * Open the git perspective. Add the following two repositories, which can be found on: (use git protocol) - https://github.com/eclipse-platform/eclipse.platform.swt * From swt repo, import most projects (except Cocoa/Gtk, root 'swt' project, once) -* In org.eclipse.swt project, you need to copy .classpath_win32 to .classpath & refresh/rebuild workspace. - (This can be done via command line or by not-filtering *.resources in package view). * And import the project that reflects your platform. * In the snippet project, add the swt project as dependency to launch snippets. * You should be able to run snippets now. (e.g Snippet1). diff --git a/bundles/org.eclipse.swt/Readme.macOS.md b/bundles/org.eclipse.swt/Readme.macOS.md index f7064ddac1e..60f36116dfa 100644 --- a/bundles/org.eclipse.swt/Readme.macOS.md +++ b/bundles/org.eclipse.swt/Readme.macOS.md @@ -3,8 +3,6 @@ macOS Development for org.eclipse.swt Please follow the following pattern for macOS development: -* If on macOS Intel copy `.classpath_cocoa_x86_64` to `.classpath` -* If on macOS Silicon copy `.classpath_cocoa_aarch64` to `.classpath` * Update `.bridgesupport` files when necessary, i.e. consuming new api in newer macOS versions * Generate native and Java code using `MacGenerator` diff --git a/bundles/org.eclipse.swt/Readme.md b/bundles/org.eclipse.swt/Readme.md index ef50b7c00a1..9cfb1433dec 100644 --- a/bundles/org.eclipse.swt/Readme.md +++ b/bundles/org.eclipse.swt/Readme.md @@ -3,24 +3,6 @@ org.eclipse.swt Main plug-in for the SWT user interface library. -Setting the classpath: ----------------------- - -To compile this project, you need to set the classpath specific for your operating and windowing system. -For this, rename one of the following files to `.classpath`: - -* .classpath_win32 - Windows -* .classpath_cocoa_x86_64 - macOS Intel -* .classpath_cocoa_aarch64 - macOS Silicon -* .classpath_gtk - Linux and all Unix variants - -Similar class paths renaming should be done for ./examples/org.eclipse.swt.snippets/ - -To see these files, you may have to remove the filter for ".* resources": -* In the Project Explorer: view menu > Customize View... > Filters -* In the Package Explorer: view menu > Filters... - - Dependencies: ------------- @@ -28,7 +10,7 @@ Dependencies: Ensure that the fragment matching your windowingSystem.operatingSystem.cpuArchitecture (e.g. org.eclipse.swt.gtk.linux.x86_64) is open in your workspace. - The fragments provide the platform-specific native libraries. + The fragments provide the platform-specific native libraries and compile the java source code. Using Assertions: ---------------- diff --git a/bundles/org.eclipse.swt/build-scripts/CollectSources.java b/bundles/org.eclipse.swt/build-scripts/CollectSources.java index 587c847893d..d34676f91d2 100644 --- a/bundles/org.eclipse.swt/build-scripts/CollectSources.java +++ b/bundles/org.eclipse.swt/build-scripts/CollectSources.java @@ -31,7 +31,7 @@ */ public class CollectSources { - private record ScriptEnvironment(Path swtProjectRoot, Path targetDirectory, String ws, String arch) { + private record ScriptEnvironment(Path swtProjectRoot, Path binariesRoot, Path targetDirectory, String ws) { private static ScriptEnvironment read(String[] args) { if (args.length != 2) { throw new IllegalArgumentException("task and target directory must be defined as only argument"); @@ -40,10 +40,10 @@ private static ScriptEnvironment read(String[] args) { if (!swtProjectRoot.endsWith(Path.of("bundles/org.eclipse.swt"))) { // Consistency check throw new IllegalStateException("Sript must be excuted from org.eclipse.swt project"); } + Path binariesRoot = swtProjectRoot.getParent().getParent().resolve("binaries").toAbsolutePath(); Path targetDirectory = Path.of(args[1]); String ws = System.getProperty("ws"); - String arch = System.getProperty("arch"); - return new ScriptEnvironment(swtProjectRoot, targetDirectory, ws, arch); + return new ScriptEnvironment(swtProjectRoot, binariesRoot, targetDirectory, ws); } } @@ -68,7 +68,7 @@ private static void collectNativeSources(ScriptEnvironment env) throws IOExcepti String commonSources = sources.get("src_common"); String nativeSources = sources.get("src_" + env.ws); List allSources = Arrays.asList((commonSources + "," + nativeSources).split(",")); - System.out.println("Copy " + allSources.size() + " native source folders for " + env.ws + "." + env.arch); + System.out.println("Copy " + allSources.size() + " native source folders for " + env.ws); copySubDirectories(env.swtProjectRoot, allSources, env.targetDirectory, Set.of()); } @@ -82,13 +82,10 @@ private static Map loadProperties(Path path) throws IOException } private static void collectJavaSources(ScriptEnvironment env) throws Exception { - Path classpathFile = env.swtProjectRoot.resolve(".classpath_" + env.ws + "_" + env.arch); - if (!Files.isRegularFile(classpathFile)) { // prefer more specific - classpathFile = env.swtProjectRoot.resolve(".classpath_" + env.ws); - } + Path classpathFile = env.binariesRoot.resolve(".classpath_" + env.ws); Set srcClassPaths = readNativeJavaSourcesFromClasspath(classpathFile); Set excludedExtensions = Set.of("_properties", "extras", "bridgesupport"); - System.out.println("Copy " + srcClassPaths.size() + " java source folders for" + env.ws + "." + env.arch); + System.out.println("Copy " + srcClassPaths.size() + " java source folders for " + env.ws); copySubDirectories(env.swtProjectRoot, srcClassPaths, env.targetDirectory, excludedExtensions); }