Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Snapshot of APIs as of NetBeans 13 #3792

Merged
merged 1 commit into from
Mar 18, 2022
Merged

Snapshot of APIs as of NetBeans 13 #3792

merged 1 commit into from
Mar 18, 2022

Conversation

neilcsmith-net
Copy link
Member

Snapshot of APIs as of NetBeans 13.

Following conflicts in merging left as in master.

both modified:   ide/libs.c.kohlschutter.junixsocket/nbproject/libs-c-kohlschutter-junixsocket.sig
both modified:   java/j2ee.eclipselink/nbproject/org-netbeans-modules-j2ee-eclipselink.sig
both modified:   java/websvc.jaxws21/nbproject/org-netbeans-modules-websvc-jaxws21.sig
both modified:   java/websvc.jaxws21api/nbproject/org-netbeans-modules-websvc-jaxws21api.sig
deleted by us:   platform/openide.util.enumerations/nbproject/org-openide-util-enumerations.sig

Built in the usual way, but now using JDK 11 (thanks @JaroslavTulach )

# checkout branch (or release tag)
git checkout release130
ant clean
ant build
ant gen-sigtests-release
git add -A
git stash
git checkout master
git checkout -b apis-nb130
git stash pop
git add -A
git commit -m "Snapshot of APIs as of NetBeans 13"
# remove getPeer() calls
find . -name "*.sig" -exec sed -i '/java.awt.peer.ComponentPeer/{N;d;}' {} \;
# check git diff
git add -A
git commit --amend

@ebarboni
Copy link
Contributor

Always complex to review, here is the short list of sig file modified more than version bump.

enterprise/glassfish.eecommon/nbproject/org-netbeans-modules-glassfish-eecommon.sig
enterprise/glassfish.tooling/nbproject/org-netbeans-modules-glassfish-tooling.sig
enterprise/j2ee.api.ejbmodule/nbproject/org-netbeans-modules-j2ee-api-ejbmodule.sig
enterprise/j2ee.common/nbproject/org-netbeans-modules-j2ee-common.sig
enterprise/j2ee.dd.webservice/nbproject/org-netbeans-modules-j2ee-dd-webservice.sig
enterprise/j2ee.dd/nbproject/org-netbeans-modules-j2ee-dd.sig
enterprise/j2ee.ejbjarproject/nbproject/org-netbeans-modules-j2ee-ejbjarproject.sig
enterprise/libs.jackson/nbproject/org-netbeans-libs-jackson.sig
enterprise/payara.common/nbproject/org-netbeans-modules-payara-common.sig
enterprise/payara.tooling/nbproject/org-netbeans-modules-payara-tooling.sig
enterprise/web.el/nbproject/org-netbeans-modules-web-el.sig
enterprise/web.jsf/nbproject/org-netbeans-modules-web-jsf.sig
enterprise/websvc.restlib/nbproject/org-netbeans-modules-websvc-restlib.sig
extide/gradle/nbproject/org-netbeans-modules-gradle.sig
groovy/groovy.editor/nbproject/org-netbeans-modules-groovy-editor.sig
ide/csl.api/nbproject/org-netbeans-modules-csl-api.sig
ide/csl.types/nbproject/org-netbeans-modules-csl-types.sig
ide/css.lib/nbproject/org-netbeans-modules-css-lib.sig
ide/db/nbproject/org-netbeans-modules-db.sig
ide/editor.completion/nbproject/org-netbeans-modules-editor-completion.sig
ide/editor.deprecated.pre65formatting/nbproject/org-netbeans-modules-editor-deprecated-pre65formatting.sig
ide/editor.plain.lib/nbproject/org-netbeans-modules-editor-plain-lib.sig
ide/html.editor/nbproject/org-netbeans-modules-html-editor.sig
ide/parsing.api/nbproject/org-netbeans-modules-parsing-api.sig
ide/parsing.indexing/nbproject/org-netbeans-modules-parsing-indexing.sig
ide/projectuiapi.base/nbproject/org-netbeans-modules-projectuiapi-base.sig
ide/projectuiapi/nbproject/org-netbeans-modules-projectuiapi.sig
ide/spi.editor.hints/nbproject/org-netbeans-spi-editor-hints.sig
ide/xml.catalog.ui/nbproject/org-netbeans-modules-xml-catalog-ui.sig
ide/xml.text.obsolete90/nbproject/org-netbeans-modules-xml-text-obsolete90.sig
java/j2ee.persistence/nbproject/org-netbeans-modules-j2ee-persistence.sig
java/java.completion/nbproject/org-netbeans-modules-java-completion.sig
java/java.source.base/nbproject/org-netbeans-modules-java-source-base.sig
java/java.source/nbproject/org-netbeans-modules-java-source.sig
java/libs.javacapi/nbproject/org-netbeans-libs-javacapi.sig
java/maven.embedder/nbproject/org-netbeans-modules-maven-embedder.sig
java/maven/nbproject/org-netbeans-modules-maven.sig
php/php.api.phpmodule/nbproject/org-netbeans-modules-php-api-phpmodule.sig
php/php.editor/nbproject/org-netbeans-modules-php-editor.sig
platform/api.htmlui/nbproject/org-netbeans-api-htmlui.sig
platform/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig
platform/api.templates/nbproject/org-netbeans-api-templates.sig
platform/libs.flatlaf/nbproject/org-netbeans-libs-flatlaf.sig
platform/o.n.swing.plaf/nbproject/org-netbeans-swing-plaf.sig
platform/openide.compat/nbproject/org-openide-compat.sig
platform/openide.filesystems.compat8/nbproject/org-openide-filesystems-compat8.sig
platform/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig
platform/openide.filesystems/nbproject/org-openide-filesystems.sig
platform/openide.loaders/nbproject/org-openide-loaders.sig
platform/openide.util.ui/nbproject/org-openide-util-ui.sig
profiler/profiler.heapwalker/nbproject/org-netbeans-modules-profiler-heapwalker.sig
webcommon/javascript2.types/nbproject/org-netbeans-modules-javascript2-types.sig
websvccommon/websvc.saas.api/nbproject/org-netbeans-modules-websvc-saas-api.sig

@JaroslavTulach
Copy link

JaroslavTulach commented Mar 17, 2022 •
edited

Diff of all important changes can be generated with:

curl -L https://github.com/apache/netbeans/pull/3792.diff | | filterdiff -#2- >important.diff

Extracting from the important.diff I see following changes in platform/* and they look sane:

diff --git a/platform/api.htmlui/nbproject/org-netbeans-api-htmlui.sig b/platform/api.htmlui/nbproject/org-netbeans-api-htmlui.sig
index a551d51ef823..2fca74973ee8 100644
--- a/platform/api.htmlui/nbproject/org-netbeans-api-htmlui.sig
+++ b/platform/api.htmlui/nbproject/org-netbeans-api-htmlui.sig
@@ -53,6 +53,7 @@ meth public abstract java.lang.String url()
 CLSS public abstract interface !annotation org.netbeans.api.htmlui.HTMLDialog
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD])
+innr public abstract interface static OnSubmit
 innr public final static Builder
 intf java.lang.annotation.Annotation
 meth public abstract !hasdefault java.lang.String className()
@@ -66,8 +67,14 @@ meth public <%0 extends java.lang.Object> {%%0} component(java.lang.Class<{%%0}>
 meth public java.lang.String showAndWait()
 meth public org.netbeans.api.htmlui.HTMLDialog$Builder loadFinished(java.lang.Runnable)
 meth public static org.netbeans.api.htmlui.HTMLDialog$Builder newDialog(java.lang.String)
+meth public void show(org.netbeans.api.htmlui.HTMLDialog$OnSubmit)
 supr java.lang.Object
-hfds impl
+hfds onPageLoad,techIds,url
+
+CLSS public abstract interface static org.netbeans.api.htmlui.HTMLDialog$OnSubmit
+ outer org.netbeans.api.htmlui.HTMLDialog
+ anno 0 java.lang.FunctionalInterface()
+meth public abstract boolean onSubmit(java.lang.String)
 
 CLSS public abstract interface !annotation org.netbeans.api.htmlui.OpenHTMLRegistration
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
@@ -78,3 +85,26 @@ meth public abstract !hasdefault java.lang.String[] techIds()
 meth public abstract java.lang.String displayName()
 meth public abstract java.lang.String url()
 
+CLSS public abstract interface org.netbeans.spi.htmlui.HTMLViewerSpi<%0 extends java.lang.Object, %1 extends java.lang.Object>
+innr public final static Context
+meth public abstract <%0 extends java.lang.Object> {%%0} component({org.netbeans.spi.htmlui.HTMLViewerSpi%0},java.lang.Class<{%%0}>)
+meth public abstract java.lang.String getId({org.netbeans.spi.htmlui.HTMLViewerSpi%0},{org.netbeans.spi.htmlui.HTMLViewerSpi%1})
+meth public abstract void runLater({org.netbeans.spi.htmlui.HTMLViewerSpi%0},java.lang.Runnable)
+meth public abstract void setEnabled({org.netbeans.spi.htmlui.HTMLViewerSpi%0},{org.netbeans.spi.htmlui.HTMLViewerSpi%1},boolean)
+meth public abstract void setText({org.netbeans.spi.htmlui.HTMLViewerSpi%0},{org.netbeans.spi.htmlui.HTMLViewerSpi%1},java.lang.String)
+meth public abstract {org.netbeans.spi.htmlui.HTMLViewerSpi%0} newView(org.netbeans.spi.htmlui.HTMLViewerSpi$Context)
+meth public abstract {org.netbeans.spi.htmlui.HTMLViewerSpi%1} createButton({org.netbeans.spi.htmlui.HTMLViewerSpi%0},java.lang.String)
+
+CLSS public final static org.netbeans.spi.htmlui.HTMLViewerSpi$Context
+ outer org.netbeans.spi.htmlui.HTMLViewerSpi
+meth public boolean isBlocking()
+meth public boolean isDialog()
+meth public boolean isWindow()
+meth public boolean onSubmit(java.lang.String)
+meth public java.lang.ClassLoader getClassLoader()
+meth public java.lang.String[] getTechIds()
+meth public java.net.URL getPage()
+meth public org.openide.util.Lookup onPageLoad()
+supr java.lang.Object
+hfds component,lifeCycleCallback,loader,onPageLoad,onSubmit,techIds,url
+
diff --git a/platform/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig b/platform/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig
index 044cdb5077a1..0c8c02a0c04e 100644
--- a/platform/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig
+++ b/platform/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig
@@ -111,7 +111,9 @@ meth public static org.netbeans.api.progress.ProgressHandle createHandle(java.la
 meth public static org.netbeans.api.progress.ProgressHandle createSystemHandle(java.lang.String)
  anno 0 java.lang.Deprecated()
 meth public static org.netbeans.api.progress.ProgressHandle createSystemHandle(java.lang.String,org.openide.util.Cancellable)
+ anno 0 java.lang.Deprecated()
 meth public static org.netbeans.api.progress.ProgressHandle createSystemHandle(java.lang.String,org.openide.util.Cancellable,javax.swing.Action)
+ anno 0 java.lang.Deprecated()
 meth public static org.netbeans.api.progress.ProgressHandle createSystemUIHandle(java.lang.String,org.openide.util.Cancellable,javax.swing.Action)
 meth public static org.netbeans.api.progress.ProgressHandle createUIHandle(java.lang.String,org.openide.util.Cancellable,javax.swing.Action)
 supr java.lang.Object
diff --git a/platform/api.templates/nbproject/org-netbeans-api-templates.sig b/platform/api.templates/nbproject/org-netbeans-api-templates.sig
index 7f1f1736c02c..15c1d74b13b2 100644
--- a/platform/api.templates/nbproject/org-netbeans-api-templates.sig
+++ b/platform/api.templates/nbproject/org-netbeans-api-templates.sig
@@ -81,8 +81,9 @@ meth public org.openide.filesystems.FileObject getTarget()
  anno 0 org.netbeans.api.annotations.common.NonNull()
 meth public org.openide.filesystems.FileObject getTemplate()
  anno 0 org.netbeans.api.annotations.common.NonNull()
+meth public org.openide.util.Lookup getLookup()
 supr java.lang.Object
-hfds freeExtension,locale,name,parameters,preformatted,proposedName,target,template
+hfds contextLookup,freeExtension,locale,name,parameters,preformatted,proposedName,target,template
 
 CLSS public abstract interface org.netbeans.api.templates.CreateFromTemplateAttributes
 meth public abstract java.util.Map<java.lang.String,?> attributesFor(org.netbeans.api.templates.CreateDescriptor)
@@ -101,12 +102,18 @@ cons public init()
 meth protected abstract boolean accept(org.netbeans.api.templates.CreateDescriptor)
 meth protected abstract java.util.List<org.openide.filesystems.FileObject> createFromTemplate(org.netbeans.api.templates.CreateDescriptor) throws java.io.IOException
  anno 0 org.netbeans.api.annotations.common.NonNull()
+meth protected static java.util.List<org.openide.filesystems.FileObject> defaultCopyContents(org.netbeans.api.templates.CreateDescriptor,org.openide.filesystems.FileObject,org.openide.filesystems.FileObject) throws java.io.IOException
+meth public static void copyAttributesFromTemplate(org.netbeans.api.templates.CreateFromTemplateHandler,org.openide.filesystems.FileObject,org.openide.filesystems.FileObject) throws java.io.IOException
 supr java.lang.Object
+hfds ATTR_TEMPLATE_PREFIX,PROP_TEMPLATE
 
 CLSS public final org.netbeans.api.templates.FileBuilder
 cons public init(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject)
  anno 1 org.netbeans.api.annotations.common.NonNull()
  anno 2 org.netbeans.api.annotations.common.NonNull()
+fld public final static java.lang.String ATTR_TEMPLATE_HANDLER = "template.createTemplateHandler"
+fld public final static java.lang.String ATTR_TEMPLATE_MERGE_FOLDERS = "template.mergeFolders"
+fld public final static java.lang.String ATTR_TEMPLATE_OPEN_FILE = "template.openFile"
 innr public final static !enum Mode
 meth public java.util.List<org.openide.filesystems.FileObject> build() throws java.io.IOException
  anno 0 org.netbeans.api.annotations.common.CheckForNull()
@@ -121,6 +128,7 @@ meth public org.netbeans.api.templates.FileBuilder useFormat(java.text.Format)
  anno 1 org.netbeans.api.annotations.common.NonNull()
 meth public org.netbeans.api.templates.FileBuilder useLocale(java.util.Locale)
  anno 1 org.netbeans.api.annotations.common.NonNull()
+meth public org.netbeans.api.templates.FileBuilder useLookup(org.openide.util.Lookup)
 meth public org.netbeans.api.templates.FileBuilder withParameters(java.util.Map<java.lang.String,?>)
  anno 1 org.netbeans.api.annotations.common.NullAllowed()
 meth public static org.netbeans.api.templates.FileBuilder fromDescriptor(org.netbeans.api.templates.CreateDescriptor)
@@ -150,6 +158,7 @@ CLSS public abstract interface !annotation org.netbeans.api.templates.TemplateRe
 intf java.lang.annotation.Annotation
 meth public abstract !hasdefault boolean requireProject()
 meth public abstract !hasdefault int position()
+meth public abstract !hasdefault java.lang.Class<? extends org.netbeans.api.templates.CreateFromTemplateHandler> createHandlerClass()
 meth public abstract !hasdefault java.lang.String description()
 meth public abstract !hasdefault java.lang.String displayName()
 meth public abstract !hasdefault java.lang.String iconBase()
diff --git a/platform/libs.flatlaf/nbproject/org-netbeans-libs-flatlaf.sig b/platform/libs.flatlaf/nbproject/org-netbeans-libs-flatlaf.sig
index d00df18084f4..48de4ac62569 100644
--- a/platform/libs.flatlaf/nbproject/org-netbeans-libs-flatlaf.sig
+++ b/platform/libs.flatlaf/nbproject/org-netbeans-libs-flatlaf.sig
@@ -31,6 +31,8 @@ fld public final static java.lang.String SELECT_ALL_ON_FOCUS_POLICY_ALWAYS = "al
 fld public final static java.lang.String SELECT_ALL_ON_FOCUS_POLICY_NEVER = "never"
 fld public final static java.lang.String SELECT_ALL_ON_FOCUS_POLICY_ONCE = "once"
 fld public final static java.lang.String SQUARE_SIZE = "JButton.squareSize"
+fld public final static java.lang.String STYLE = "FlatLaf.style"
+fld public final static java.lang.String STYLE_CLASS = "FlatLaf.styleClass"
 fld public final static java.lang.String TABBED_PANE_ALIGN_CENTER = "center"
 fld public final static java.lang.String TABBED_PANE_ALIGN_FILL = "fill"
 fld public final static java.lang.String TABBED_PANE_ALIGN_LEADING = "leading"
@@ -59,6 +61,9 @@ fld public final static java.lang.String TABBED_PANE_TAB_CLOSE_TOOLTIPTEXT = "JT
 fld public final static java.lang.String TABBED_PANE_TAB_HEIGHT = "JTabbedPane.tabHeight"
 fld public final static java.lang.String TABBED_PANE_TAB_ICON_PLACEMENT = "JTabbedPane.tabIconPlacement"
 fld public final static java.lang.String TABBED_PANE_TAB_INSETS = "JTabbedPane.tabInsets"
+fld public final static java.lang.String TABBED_PANE_TAB_TYPE = "JTabbedPane.tabType"
+fld public final static java.lang.String TABBED_PANE_TAB_TYPE_CARD = "card"
+fld public final static java.lang.String TABBED_PANE_TAB_TYPE_UNDERLINED = "underlined"
 fld public final static java.lang.String TABBED_PANE_TAB_WIDTH_MODE = "JTabbedPane.tabWidthMode"
 fld public final static java.lang.String TABBED_PANE_TAB_WIDTH_MODE_COMPACT = "compact"
 fld public final static java.lang.String TABBED_PANE_TAB_WIDTH_MODE_EQUAL = "equal"
@@ -67,12 +72,20 @@ fld public final static java.lang.String TABBED_PANE_TRAILING_COMPONENT = "JTabb
 fld public final static java.lang.String TAB_BUTTON_SELECTED_BACKGROUND = "JToggleButton.tab.selectedBackground"
 fld public final static java.lang.String TAB_BUTTON_UNDERLINE_COLOR = "JToggleButton.tab.underlineColor"
 fld public final static java.lang.String TAB_BUTTON_UNDERLINE_HEIGHT = "JToggleButton.tab.underlineHeight"
+fld public final static java.lang.String TEXT_FIELD_CLEAR_CALLBACK = "JTextField.clearCallback"
+fld public final static java.lang.String TEXT_FIELD_LEADING_COMPONENT = "JTextField.leadingComponent"
+fld public final static java.lang.String TEXT_FIELD_LEADING_ICON = "JTextField.leadingIcon"
 fld public final static java.lang.String TEXT_FIELD_PADDING = "JTextField.padding"
+fld public final static java.lang.String TEXT_FIELD_SHOW_CLEAR_BUTTON = "JTextField.showClearButton"
+fld public final static java.lang.String TEXT_FIELD_TRAILING_COMPONENT = "JTextField.trailingComponent"
+fld public final static java.lang.String TEXT_FIELD_TRAILING_ICON = "JTextField.trailingIcon"
 fld public final static java.lang.String TITLE_BAR_BACKGROUND = "JRootPane.titleBarBackground"
 fld public final static java.lang.String TITLE_BAR_FOREGROUND = "JRootPane.titleBarForeground"
+fld public final static java.lang.String TITLE_BAR_SHOW_ICON = "JRootPane.titleBarShowIcon"
 fld public final static java.lang.String TREE_PAINT_SELECTION = "JTree.paintSelection"
 fld public final static java.lang.String TREE_WIDE_SELECTION = "JTree.wideSelection"
 fld public final static java.lang.String USE_WINDOW_DECORATIONS = "JRootPane.useWindowDecorations"
+meth public static <%0 extends java.lang.Object> {%%0} clientProperty(javax.swing.JComponent,java.lang.String,{%%0},java.lang.Class<{%%0}>)
 meth public static boolean clientPropertyBoolean(javax.swing.JComponent,java.lang.String,boolean)
 meth public static boolean clientPropertyEquals(javax.swing.JComponent,java.lang.String,java.lang.Object)
 meth public static int clientPropertyInt(javax.swing.JComponent,java.lang.String,int)
@@ -165,6 +178,7 @@ meth public boolean isSupportedLookAndFeel()
 meth public final boolean equals(java.lang.Object)
 meth public final int hashCode()
 meth public java.lang.String getID()
+meth public java.util.Map<java.lang.String,java.lang.String> getExtraDefaults()
 meth public javax.swing.Icon getDisabledIcon(javax.swing.JComponent,javax.swing.Icon)
 meth public javax.swing.UIDefaults getDefaults()
 meth public static boolean install(javax.swing.LookAndFeel)
@@ -174,6 +188,8 @@ meth public static boolean isShowMnemonics()
 meth public static boolean isUseNativeWindowDecorations()
 meth public static boolean setup(javax.swing.LookAndFeel)
 meth public static boolean supportsNativeWindowDecorations()
+meth public static java.lang.Object parseDefaultsValue(java.lang.String,java.lang.String,java.lang.Class<?>)
+meth public static java.util.Map<java.lang.String,java.lang.String> getGlobalExtraDefaults()
 meth public static javax.swing.UIDefaults$ActiveValue createActiveFontValue(float)
 meth public static void hideMnemonics()
 meth public static void initIconColors(javax.swing.UIDefaults,boolean)
@@ -181,22 +197,26 @@ meth public static void installLafInfo(java.lang.String,java.lang.Class<? extend
 meth public static void registerCustomDefaultsSource(java.io.File)
 meth public static void registerCustomDefaultsSource(java.lang.String)
 meth public static void registerCustomDefaultsSource(java.lang.String,java.lang.ClassLoader)
+meth public static void registerCustomDefaultsSource(java.net.URL)
 meth public static void repaintAllFramesAndDialogs()
 meth public static void revalidateAndRepaintAllFramesAndDialogs()
 meth public static void runWithUIDefaultsGetter(java.util.function.Function<java.lang.Object,java.lang.Object>,java.lang.Runnable)
+meth public static void setGlobalExtraDefaults(java.util.Map<java.lang.String,java.lang.String>)
 meth public static void setUseNativeWindowDecorations(boolean)
 meth public static void showMnemonics(java.awt.Component)
 meth public static void unregisterCustomDefaultsSource(java.io.File)
 meth public static void unregisterCustomDefaultsSource(java.lang.String)
 meth public static void unregisterCustomDefaultsSource(java.lang.String,java.lang.ClassLoader)
+meth public static void unregisterCustomDefaultsSource(java.net.URL)
 meth public static void updateUI()
 meth public static void updateUILater()
 meth public void initialize()
 meth public void registerUIDefaultsGetter(java.util.function.Function<java.lang.Object,java.lang.Object>)
+meth public void setExtraDefaults(java.util.Map<java.lang.String,java.lang.String>)
 meth public void uninitialize()
 meth public void unregisterUIDefaultsGetter(java.util.function.Function<java.lang.Object,java.lang.Object>)
 supr javax.swing.plaf.basic.BasicLookAndFeel
-hfds DESKTOPFONTHINTS,aquaLoaded,customDefaultsSources,desktopPropertyListener,desktopPropertyName,desktopPropertyName2,mnemonicHandler,oldPopupFactory,postInitialization,uiDefaultsGetters,updateUIPending
+hfds DESKTOPFONTHINTS,aquaLoaded,customDefaultsSources,desktopPropertyListener,desktopPropertyName,desktopPropertyName2,extraDefaults,globalExtraDefaults,mnemonicHandler,oldPopupFactory,postInitialization,uiDefaultsGetters,updateUIPending
 hcls ActiveFont,FlatUIDefaults,ImageIconUIResource
 
 CLSS public abstract interface static com.formdev.flatlaf.FlatLaf$DisabledIconProvider
@@ -231,6 +251,7 @@ hfds baseTheme,dark,name,properties
 CLSS public abstract interface com.formdev.flatlaf.FlatSystemProperties
 fld public final static java.lang.String ANIMATION = "flatlaf.animation"
 fld public final static java.lang.String MENUBAR_EMBEDDED = "flatlaf.menuBarEmbedded"
+fld public final static java.lang.String NATIVE_LIBRARY_PATH = "flatlaf.nativeLibraryPath"
 fld public final static java.lang.String UI_SCALE = "flatlaf.uiScale"
 fld public final static java.lang.String UI_SCALE_ALLOW_SCALE_DOWN = "flatlaf.uiScale.allowScaleDown"
 fld public final static java.lang.String UI_SCALE_ENABLED = "flatlaf.uiScale.enabled"
@@ -330,7 +351,15 @@ innr public static HSLIncreaseDecrease
 innr public static Mix
 meth public !varargs static java.awt.Color applyFunctions(java.awt.Color,com.formdev.flatlaf.util.ColorFunctions$ColorFunction[])
 meth public static float clamp(float)
+meth public static float luma(java.awt.Color)
+meth public static java.awt.Color darken(java.awt.Color,float)
+meth public static java.awt.Color desaturate(java.awt.Color,float)
+meth public static java.awt.Color lighten(java.awt.Color,float)
 meth public static java.awt.Color mix(java.awt.Color,java.awt.Color,float)
+meth public static java.awt.Color saturate(java.awt.Color,float)
+meth public static java.awt.Color shade(java.awt.Color,float)
+meth public static java.awt.Color spin(java.awt.Color,float)
+meth public static java.awt.Color tint(java.awt.Color,float)
 supr java.lang.Object
 
 CLSS public abstract interface static com.formdev.flatlaf.util.ColorFunctions$ColorFunction
@@ -566,6 +595,7 @@ meth public static java.util.List<java.awt.Image> getResolutionVariants(java.awt
 supr java.lang.Object
 
 CLSS public com.formdev.flatlaf.util.NativeLibrary
+cons public init(java.io.File,boolean)
 cons public init(java.lang.String,java.lang.ClassLoader,boolean)
 meth public boolean isLoaded()
 supr java.lang.Object
@@ -589,18 +619,52 @@ meth public void paintIcon(java.awt.Component,java.awt.Graphics,int,int)
 supr java.lang.Object
 hfds iconHeight,iconWidth,imageIcon,lastImage,lastSystemScaleFactor,lastUserScaleFactor
 
+CLSS public com.formdev.flatlaf.util.SoftCache<%0 extends java.lang.Object, %1 extends java.lang.Object>
+cons public init()
+cons public init(int)
+intf java.util.Map<{com.formdev.flatlaf.util.SoftCache%0},{com.formdev.flatlaf.util.SoftCache%1}>
+meth public boolean containsKey(java.lang.Object)
+meth public boolean containsValue(java.lang.Object)
+meth public boolean isEmpty()
+meth public int size()
+meth public java.util.Collection<{com.formdev.flatlaf.util.SoftCache%1}> values()
+meth public java.util.Set<java.util.Map$Entry<{com.formdev.flatlaf.util.SoftCache%0},{com.formdev.flatlaf.util.SoftCache%1}>> entrySet()
+meth public java.util.Set<{com.formdev.flatlaf.util.SoftCache%0}> keySet()
+meth public void clear()
+meth public void forEach(java.util.function.BiConsumer<? super {com.formdev.flatlaf.util.SoftCache%0},? super {com.formdev.flatlaf.util.SoftCache%1}>)
+meth public void putAll(java.util.Map<? extends {com.formdev.flatlaf.util.SoftCache%0},? extends {com.formdev.flatlaf.util.SoftCache%1}>)
+meth public void replaceAll(java.util.function.BiFunction<? super {com.formdev.flatlaf.util.SoftCache%0},? super {com.formdev.flatlaf.util.SoftCache%1},? extends {com.formdev.flatlaf.util.SoftCache%1}>)
+meth public {com.formdev.flatlaf.util.SoftCache%1} get(java.lang.Object)
+meth public {com.formdev.flatlaf.util.SoftCache%1} put({com.formdev.flatlaf.util.SoftCache%0},{com.formdev.flatlaf.util.SoftCache%1})
+meth public {com.formdev.flatlaf.util.SoftCache%1} remove(java.lang.Object)
+supr java.lang.Object
+hfds map,queue
+hcls CacheReference
+
 CLSS public com.formdev.flatlaf.util.StringUtils
 cons public init()
 meth public static boolean isEmpty(java.lang.String)
+meth public static boolean isTrimmedEmpty(java.lang.String)
 meth public static java.lang.String removeLeading(java.lang.String,java.lang.String)
 meth public static java.lang.String removeTrailing(java.lang.String,java.lang.String)
+meth public static java.lang.String substringTrimmed(java.lang.String,int)
+meth public static java.lang.String substringTrimmed(java.lang.String,int,int)
 meth public static java.util.List<java.lang.String> split(java.lang.String,char)
+meth public static java.util.List<java.lang.String> split(java.lang.String,char,boolean,boolean)
+supr java.lang.Object
+
+CLSS public com.formdev.flatlaf.util.SwingUtils
+cons public init()
+meth public static <%0 extends java.awt.Component> {%%0} getComponentByName(java.awt.Container,java.lang.String)
 supr java.lang.Object
 
 CLSS public com.formdev.flatlaf.util.SystemInfo
 cons public init()
+fld public final static boolean isAARCH64
 fld public final static boolean isJava_11_orLater
 fld public final static boolean isJava_15_orLater
+fld public final static boolean isJava_17_orLater
+fld public final static boolean isJava_18_orLater
 fld public final static boolean isJava_9_orLater
 fld public final static boolean isJetBrainsJVM
 fld public final static boolean isJetBrainsJVM_11_orLater
@@ -615,6 +679,8 @@ fld public final static boolean isWebswing
 fld public final static boolean isWinPE
 fld public final static boolean isWindows
 fld public final static boolean isWindows_10_orLater
+fld public final static boolean isWindows_11_orLater
+fld public final static boolean isX86
 fld public final static boolean isX86_64
 fld public final static long javaVersion
 fld public final static long osVersion
@@ -627,6 +693,7 @@ cons public init()
 meth public static boolean isSystemScalingEnabled()
 meth public static double getSystemScaleFactor(java.awt.Graphics2D)
 meth public static double getSystemScaleFactor(java.awt.GraphicsConfiguration)
+meth public static float computeFontScaleFactor(java.awt.Font)
 meth public static float getUserScaleFactor()
 meth public static float scale(float)
 meth public static float unscale(float)
@@ -933,6 +1000,34 @@ CLSS public abstract interface !annotation java.lang.annotation.Target
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.annotation.ElementType[] value()
 
+CLSS public abstract interface java.util.Map<%0 extends java.lang.Object, %1 extends java.lang.Object>
+innr public abstract interface static Entry
+meth public abstract boolean containsKey(java.lang.Object)
+meth public abstract boolean containsValue(java.lang.Object)
+meth public abstract boolean equals(java.lang.Object)
+meth public abstract boolean isEmpty()
+meth public abstract int hashCode()
+meth public abstract int size()
+meth public abstract java.util.Collection<{java.util.Map%1}> values()
+meth public abstract java.util.Set<java.util.Map$Entry<{java.util.Map%0},{java.util.Map%1}>> entrySet()
+meth public abstract java.util.Set<{java.util.Map%0}> keySet()
+meth public abstract void clear()
+meth public abstract void putAll(java.util.Map<? extends {java.util.Map%0},? extends {java.util.Map%1}>)
+meth public abstract {java.util.Map%1} get(java.lang.Object)
+meth public abstract {java.util.Map%1} put({java.util.Map%0},{java.util.Map%1})
+meth public abstract {java.util.Map%1} remove(java.lang.Object)
+meth public boolean remove(java.lang.Object,java.lang.Object)
+meth public boolean replace({java.util.Map%0},{java.util.Map%1},{java.util.Map%1})
+meth public void forEach(java.util.function.BiConsumer<? super {java.util.Map%0},? super {java.util.Map%1}>)
+meth public void replaceAll(java.util.function.BiFunction<? super {java.util.Map%0},? super {java.util.Map%1},? extends {java.util.Map%1}>)
+meth public {java.util.Map%1} compute({java.util.Map%0},java.util.function.BiFunction<? super {java.util.Map%0},? super {java.util.Map%1},? extends {java.util.Map%1}>)
+meth public {java.util.Map%1} computeIfAbsent({java.util.Map%0},java.util.function.Function<? super {java.util.Map%0},? extends {java.util.Map%1}>)
+meth public {java.util.Map%1} computeIfPresent({java.util.Map%0},java.util.function.BiFunction<? super {java.util.Map%0},? super {java.util.Map%1},? extends {java.util.Map%1}>)
+meth public {java.util.Map%1} getOrDefault(java.lang.Object,{java.util.Map%1})
+meth public {java.util.Map%1} merge({java.util.Map%0},{java.util.Map%1},java.util.function.BiFunction<? super {java.util.Map%1},? super {java.util.Map%1},? extends {java.util.Map%1}>)
+meth public {java.util.Map%1} putIfAbsent({java.util.Map%0},{java.util.Map%1})
+meth public {java.util.Map%1} replace({java.util.Map%0},{java.util.Map%1})
+
 CLSS public abstract interface javax.swing.Icon
 meth public abstract int getIconHeight()
 meth public abstract int getIconWidth()
diff --git a/platform/o.n.swing.plaf/nbproject/org-netbeans-swing-plaf.sig b/platform/o.n.swing.plaf/nbproject/org-netbeans-swing-plaf.sig
index 14d9bd8c65cb..e68e5b36e4c8 100644
--- a/platform/o.n.swing.plaf/nbproject/org-netbeans-swing-plaf.sig
+++ b/platform/o.n.swing.plaf/nbproject/org-netbeans-swing-plaf.sig
@@ -81,6 +81,9 @@ fld protected final static java.lang.String WORKPLACE_FILL = "nb_workplace_fill"
 fld public final static java.lang.String CONTROLFONT = "controlFont"
 fld public final static java.lang.String LISTFONT = "List.font"
 fld public final static java.lang.String MENUFONT = "menuFont"
+fld public final static java.lang.String OPTIONS_CATEGORIES_BUTTON_USE_NIMBUS = "nb.options.categories.button.useNimbusCategoryButton"
+fld public final static java.lang.String OPTIONS_CATEGORIES_SEPARATOR_COLOR = "nb.options.categories.separatorColor"
+fld public final static java.lang.String OPTIONS_USE_UI_DEFAULT_COLORS = "nb.options.useUIDefaultsColors"
 fld public final static java.lang.String PANELFONT = "Panel.font"
 fld public final static java.lang.String PROGRESS_CANCEL_BUTTON_ICON = "nb.progress.cancel.icon"
 fld public final static java.lang.String PROGRESS_CANCEL_BUTTON_PRESSED_ICON = "nb.progress.cancel.icon.pressed"
diff --git a/platform/openide.compat/nbproject/org-openide-compat.sig b/platform/openide.compat/nbproject/org-openide-compat.sig
index cb56335012a9..ec6390ce0643 100644
--- a/platform/openide.compat/nbproject/org-openide-compat.sig
+++ b/platform/openide.compat/nbproject/org-openide-compat.sig
@@ -1179,6 +1179,7 @@ meth public abstract java.net.URL getResourceRoot() throws java.net.MalformedURL
 meth public abstract java.net.URL getResourceURL(java.lang.String) throws java.net.MalformedURLException,java.net.UnknownHostException
 
 CLSS public final org.openide.util.ImageUtilities
+fld public final static java.lang.String PROPERTY_URL = "url"
 meth public final static java.awt.Image addToolTipToImage(java.awt.Image,java.lang.String)
 meth public final static java.awt.Image assignToolTipToImage(java.awt.Image,java.lang.String)
 meth public final static java.awt.Image icon2Image(javax.swing.Icon)
@@ -1189,9 +1190,10 @@ meth public final static java.lang.String getImageToolTip(java.awt.Image)
 meth public final static javax.swing.Icon image2Icon(java.awt.Image)
 meth public final static javax.swing.ImageIcon loadImageIcon(java.lang.String,boolean)
 meth public static java.awt.Image createDisabledImage(java.awt.Image)
+meth public static java.net.URL findImageBaseURL(java.awt.Image)
 meth public static javax.swing.Icon createDisabledIcon(javax.swing.Icon)
 supr java.lang.Object
-hfds DARK_LAF_SUFFIX,ERR,LOGGER,NO_ICON,PNG_READER,TOOLTIP_SEPAR,cache,classLoaderLoader,component,compositeCache,dummyIconComponent,extraInitialSlashes,imageIconFilter,imageToolTipCache,localizedCache,mediaTrackerID,svgLoaderLoader,tracker
+hfds DARK_LAF_SUFFIX,ERR,LOGGER,NO_ICON,PNG_READER,TOOLTIP_SEPAR,cache,classLoaderLoader,component,compositeCache,dummyIconComponentButton,dummyIconComponentLabel,extraInitialSlashes,imageIconFilter,imageToolTipCache,localizedCache,mediaTrackerID,svgLoaderLoader,tracker
 hcls ActiveRef,CachedLookupLoader,CompositeImageKey,DisabledButtonFilter,IconImageIcon,MergedIcon,ToolTipImage,ToolTipImageKey
 
 CLSS public abstract org.openide.util.Lookup
diff --git a/platform/openide.filesystems.compat8/nbproject/org-openide-filesystems-compat8.sig b/platform/openide.filesystems.compat8/nbproject/org-openide-filesystems-compat8.sig
index 1e0b7e8cd564..7f0604bceb27 100644
--- a/platform/openide.filesystems.compat8/nbproject/org-openide-filesystems-compat8.sig
+++ b/platform/openide.filesystems.compat8/nbproject/org-openide-filesystems-compat8.sig
@@ -594,6 +594,7 @@ meth public static java.net.URLStreamHandler nbfsURLStreamHandler()
  anno 0 java.lang.Deprecated()
 meth public static java.util.List<java.lang.String> getMIMETypeExtensions(java.lang.String)
 meth public static java.util.List<org.openide.filesystems.FileObject> getOrder(java.util.Collection<org.openide.filesystems.FileObject>,boolean)
+meth public static java.util.function.BiFunction<java.lang.String,java.lang.Object,java.lang.Object> defaultAttributesTransformer()
 meth public static org.openide.filesystems.FileChangeListener weakFileChangeListener(org.openide.filesystems.FileChangeListener,java.lang.Object)
 meth public static org.openide.filesystems.FileObject copyFile(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String) throws java.io.IOException
 meth public static org.openide.filesystems.FileObject copyFile(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String,java.lang.String) throws java.io.IOException
@@ -621,6 +622,7 @@ meth public static void addRecursiveListener(org.openide.filesystems.FileChangeL
 meth public static void addRecursiveListener(org.openide.filesystems.FileChangeListener,java.io.File,java.util.concurrent.Callable<java.lang.Boolean>)
 meth public static void copy(java.io.InputStream,java.io.OutputStream) throws java.io.IOException
 meth public static void copyAttributes(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject) throws java.io.IOException
+meth public static void copyAttributes(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.util.function.BiFunction<java.lang.String,java.lang.Object,java.lang.Object>) throws java.io.IOException
 meth public static void extractJar(org.openide.filesystems.FileObject,java.io.InputStream) throws java.io.IOException
  anno 0 java.lang.Deprecated()
 meth public static void preventFileChooserSymlinkTraversal(javax.swing.JFileChooser,java.io.File)
@@ -632,7 +634,7 @@ meth public static void removeRecursiveListener(org.openide.filesystems.FileChan
 meth public static void setMIMEType(java.lang.String,java.lang.String)
 meth public static void setOrder(java.util.List<org.openide.filesystems.FileObject>) throws java.io.IOException
 supr java.lang.Object
-hfds ILLEGAL_FILENAME_CHARACTERS,LOG,REFRESH_RP,archiveRootProviderCache,archiveRootProviders,diskFileSystem,normalizedRef,refreshTask,transientAttributes
+hfds DEFAULT_ATTR_TRANSFORMER,ILLEGAL_FILENAME_CHARACTERS,LOG,REFRESH_RP,archiveRootProviderCache,archiveRootProviders,diskFileSystem,normalizedRef,refreshTask,transientAttributes
 hcls NonCanonicalizingFile
 
 CLSS public org.openide.filesystems.JarFileSystem
diff --git a/platform/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig b/platform/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig
index 9a3dc4e69a27..892229ee44b5 100644
--- a/platform/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig
+++ b/platform/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig
@@ -523,6 +523,7 @@ meth public static java.net.URLStreamHandler nbfsURLStreamHandler()
  anno 0 java.lang.Deprecated()
 meth public static java.util.List<java.lang.String> getMIMETypeExtensions(java.lang.String)
 meth public static java.util.List<org.openide.filesystems.FileObject> getOrder(java.util.Collection<org.openide.filesystems.FileObject>,boolean)
+meth public static java.util.function.BiFunction<java.lang.String,java.lang.Object,java.lang.Object> defaultAttributesTransformer()
 meth public static org.openide.filesystems.FileChangeListener weakFileChangeListener(org.openide.filesystems.FileChangeListener,java.lang.Object)
 meth public static org.openide.filesystems.FileObject copyFile(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String) throws java.io.IOException
 meth public static org.openide.filesystems.FileObject copyFile(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String,java.lang.String) throws java.io.IOException
@@ -550,6 +551,7 @@ meth public static void addRecursiveListener(org.openide.filesystems.FileChangeL
 meth public static void addRecursiveListener(org.openide.filesystems.FileChangeListener,java.io.File,java.util.concurrent.Callable<java.lang.Boolean>)
 meth public static void copy(java.io.InputStream,java.io.OutputStream) throws java.io.IOException
 meth public static void copyAttributes(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject) throws java.io.IOException
+meth public static void copyAttributes(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.util.function.BiFunction<java.lang.String,java.lang.Object,java.lang.Object>) throws java.io.IOException
 meth public static void extractJar(org.openide.filesystems.FileObject,java.io.InputStream) throws java.io.IOException
  anno 0 java.lang.Deprecated()
 meth public static void preventFileChooserSymlinkTraversal(javax.swing.JFileChooser,java.io.File)
@@ -561,7 +563,7 @@ meth public static void removeRecursiveListener(org.openide.filesystems.FileChan
 meth public static void setMIMEType(java.lang.String,java.lang.String)
 meth public static void setOrder(java.util.List<org.openide.filesystems.FileObject>) throws java.io.IOException
 supr java.lang.Object
-hfds ILLEGAL_FILENAME_CHARACTERS,LOG,REFRESH_RP,archiveRootProviderCache,archiveRootProviders,diskFileSystem,normalizedRef,refreshTask,transientAttributes
+hfds DEFAULT_ATTR_TRANSFORMER,ILLEGAL_FILENAME_CHARACTERS,LOG,REFRESH_RP,archiveRootProviderCache,archiveRootProviders,diskFileSystem,normalizedRef,refreshTask,transientAttributes
 hcls NonCanonicalizingFile
 
 CLSS public abstract interface org.openide.filesystems.ImageDecorator
diff --git a/platform/openide.filesystems/nbproject/org-openide-filesystems.sig b/platform/openide.filesystems/nbproject/org-openide-filesystems.sig
index 4a22f91fd895..92f980cc8efd 100644
--- a/platform/openide.filesystems/nbproject/org-openide-filesystems.sig
+++ b/platform/openide.filesystems/nbproject/org-openide-filesystems.sig
@@ -494,6 +494,7 @@ meth public static java.net.URLStreamHandler nbfsURLStreamHandler()
  anno 0 java.lang.Deprecated()
 meth public static java.util.List<java.lang.String> getMIMETypeExtensions(java.lang.String)
 meth public static java.util.List<org.openide.filesystems.FileObject> getOrder(java.util.Collection<org.openide.filesystems.FileObject>,boolean)
+meth public static java.util.function.BiFunction<java.lang.String,java.lang.Object,java.lang.Object> defaultAttributesTransformer()
 meth public static org.openide.filesystems.FileChangeListener weakFileChangeListener(org.openide.filesystems.FileChangeListener,java.lang.Object)
 meth public static org.openide.filesystems.FileObject copyFile(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String) throws java.io.IOException
 meth public static org.openide.filesystems.FileObject copyFile(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String,java.lang.String) throws java.io.IOException
@@ -521,6 +522,7 @@ meth public static void addRecursiveListener(org.openide.filesystems.FileChangeL
 meth public static void addRecursiveListener(org.openide.filesystems.FileChangeListener,java.io.File,java.util.concurrent.Callable<java.lang.Boolean>)
 meth public static void copy(java.io.InputStream,java.io.OutputStream) throws java.io.IOException
 meth public static void copyAttributes(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject) throws java.io.IOException
+meth public static void copyAttributes(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.util.function.BiFunction<java.lang.String,java.lang.Object,java.lang.Object>) throws java.io.IOException
 meth public static void extractJar(org.openide.filesystems.FileObject,java.io.InputStream) throws java.io.IOException
  anno 0 java.lang.Deprecated()
 meth public static void preventFileChooserSymlinkTraversal(javax.swing.JFileChooser,java.io.File)
@@ -532,7 +534,7 @@ meth public static void removeRecursiveListener(org.openide.filesystems.FileChan
 meth public static void setMIMEType(java.lang.String,java.lang.String)
 meth public static void setOrder(java.util.List<org.openide.filesystems.FileObject>) throws java.io.IOException
 supr java.lang.Object
-hfds ILLEGAL_FILENAME_CHARACTERS,LOG,REFRESH_RP,archiveRootProviderCache,archiveRootProviders,diskFileSystem,normalizedRef,refreshTask,transientAttributes
+hfds DEFAULT_ATTR_TRANSFORMER,ILLEGAL_FILENAME_CHARACTERS,LOG,REFRESH_RP,archiveRootProviderCache,archiveRootProviders,diskFileSystem,normalizedRef,refreshTask,transientAttributes
 hcls NonCanonicalizingFile
 
 CLSS public org.openide.filesystems.JarFileSystem
diff --git a/platform/openide.loaders/nbproject/org-openide-loaders.sig b/platform/openide.loaders/nbproject/org-openide-loaders.sig
index 087410ea6ee0..9bd478b38bcb 100644
--- a/platform/openide.loaders/nbproject/org-openide-loaders.sig
+++ b/platform/openide.loaders/nbproject/org-openide-loaders.sig
@@ -1730,7 +1730,10 @@ cons public init()
 meth protected abstract boolean accept(org.netbeans.api.templates.CreateDescriptor)
 meth protected abstract java.util.List<org.openide.filesystems.FileObject> createFromTemplate(org.netbeans.api.templates.CreateDescriptor) throws java.io.IOException
  anno 0 org.netbeans.api.annotations.common.NonNull()
+meth protected static java.util.List<org.openide.filesystems.FileObject> defaultCopyContents(org.netbeans.api.templates.CreateDescriptor,org.openide.filesystems.FileObject,org.openide.filesystems.FileObject) throws java.io.IOException
+meth public static void copyAttributesFromTemplate(org.netbeans.api.templates.CreateFromTemplateHandler,org.openide.filesystems.FileObject,org.openide.filesystems.FileObject) throws java.io.IOException
 supr java.lang.Object
+hfds ATTR_TEMPLATE_PREFIX,PROP_TEMPLATE
 
 CLSS public org.openide.DialogDescriptor
 cons public init(java.lang.Object,java.lang.String)
@@ -3323,6 +3326,7 @@ hfds EA_LISTENERS,entry,listeners,types,typesSet
 hcls Pair
 
 CLSS public abstract interface org.openide.loaders.CreateFromTemplateAttributesProvider
+ anno 0 java.lang.Deprecated()
 meth public abstract java.util.Map<java.lang.String,?> attributesFor(org.openide.loaders.DataObject,org.openide.loaders.DataFolder,java.lang.String)
 
 CLSS public abstract org.openide.loaders.CreateFromTemplateHandler
diff --git a/platform/openide.util.ui/nbproject/org-openide-util-ui.sig b/platform/openide.util.ui/nbproject/org-openide-util-ui.sig
index d78a5f214c21..19ace4bda7ef 100644
--- a/platform/openide.util.ui/nbproject/org-openide-util-ui.sig
+++ b/platform/openide.util.ui/nbproject/org-openide-util-ui.sig
@@ -805,6 +805,7 @@ CLSS public abstract interface static org.openide.util.HelpCtx$Provider
 meth public abstract org.openide.util.HelpCtx getHelpCtx()
 
 CLSS public final org.openide.util.ImageUtilities
+fld public final static java.lang.String PROPERTY_URL = "url"
 meth public final static java.awt.Image addToolTipToImage(java.awt.Image,java.lang.String)
 meth public final static java.awt.Image assignToolTipToImage(java.awt.Image,java.lang.String)
 meth public final static java.awt.Image icon2Image(javax.swing.Icon)
@@ -815,9 +816,10 @@ meth public final static java.lang.String getImageToolTip(java.awt.Image)
 meth public final static javax.swing.Icon image2Icon(java.awt.Image)
 meth public final static javax.swing.ImageIcon loadImageIcon(java.lang.String,boolean)
 meth public static java.awt.Image createDisabledImage(java.awt.Image)
+meth public static java.net.URL findImageBaseURL(java.awt.Image)
 meth public static javax.swing.Icon createDisabledIcon(javax.swing.Icon)
 supr java.lang.Object
-hfds DARK_LAF_SUFFIX,ERR,LOGGER,NO_ICON,PNG_READER,TOOLTIP_SEPAR,cache,classLoaderLoader,component,compositeCache,dummyIconComponent,extraInitialSlashes,imageIconFilter,imageToolTipCache,localizedCache,mediaTrackerID,svgLoaderLoader,tracker
+hfds DARK_LAF_SUFFIX,ERR,LOGGER,NO_ICON,PNG_READER,TOOLTIP_SEPAR,cache,classLoaderLoader,component,compositeCache,dummyIconComponentButton,dummyIconComponentLabel,extraInitialSlashes,imageIconFilter,imageToolTipCache,localizedCache,mediaTrackerID,svgLoaderLoader,tracker
 hcls ActiveRef,CachedLookupLoader,CompositeImageKey,DisabledButtonFilter,IconImageIcon,MergedIcon,ToolTipImage,ToolTipImageKey
 
 CLSS public abstract org.openide.util.Lookup

JaroslavTulach
JaroslavTulach approved these changes Mar 17, 2022
View reviewed changes
Copy link

@JaroslavTulach JaroslavTulach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Platform looks fine.

@neilcsmith-net
Copy link
Member Author

Thanks both. Let's get this in before we get any more conflicts.

@neilcsmith-net neilcsmith-net merged commit e2f09f0 into apache:master Mar 18, 2022
@neilcsmith-net neilcsmith-net mentioned this pull request Aug 11, 2022
Merged
@neilcsmith-net neilcsmith-net deleted the apis-nb130 branch January 16, 2024 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JaroslavTulach JaroslavTulach JaroslavTulach approved these changes

@ebarboni ebarboni Awaiting requested review from ebarboni

@geertjanw geertjanw Awaiting requested review from geertjanw

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@neilcsmith-net @ebarboni @JaroslavTulach