[netbeans] branch master updated: [NETBEANS-5683] - remove last remaining HashSet raw type warnings..
This is an automated email from the ASF dual-hosted git repository. bwalker pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 444f854 [NETBEANS-5683] - remove last remaining HashSet raw type warnings.. new c53f6b6 Merge pull request #2958 from BradWalker/cleanup_hashset_rawtype 444f854 is described below commit 444f854ae5aeceb6d1fa81b7f489b000810e9b0e Author: Brad Walker AuthorDate: Sun May 16 11:39:10 2021 -0600 [NETBEANS-5683] - remove last remaining HashSet raw type warnings.. This change will remove the last remaining warnings about raw type HashSet. [repeat] /home/bwalker/src/netbeans/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewActionMap.java:124: warning: [rawtypes] found raw type: HashSet [repeat] Set keys = new HashSet(); [repeat]^ [repeat] missing type arguments for generic class HashSet [repeat] where E is a type-variable: [repeat] E extends Object declared in class HashSet At this point, we have removed all warnings related to this.. Hooray!! --- .../modules/maven/apisupport/MavenWhiteListQueryImpl.java| 8 .../modules/j2ee/genericserver/ide/GSJ2eePlatformFactory.java| 8 .../src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java | 2 +- .../modules/websvc/manager/model/WebServiceListModel.java| 5 +++-- .../modules/websvc/rest/codegen/model/GenericResourceBean.java | 2 +- .../modules/gradle/java/classpath/GradleSourcesImpl.java | 2 +- .../src/org/netbeans/modules/autoupdate/services/Utilities.java | 2 +- .../src/org/netbeans/core/multiview/MultiViewActionMap.java | 4 +++- .../org/netbeans/core/multiview/MultiViewTopComponentLookup.java | 8 platform/openide.nodes/src/org/openide/nodes/CookieSet.java | 2 +- .../src/org/openide/options/VetoSystemOption.java| 9 + 11 files changed, 28 insertions(+), 24 deletions(-) diff --git a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenWhiteListQueryImpl.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenWhiteListQueryImpl.java index 348ebc2..57500b4 100644 --- a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenWhiteListQueryImpl.java +++ b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenWhiteListQueryImpl.java @@ -112,13 +112,13 @@ public class MavenWhiteListQueryImpl implements WhiteListQueryImplementation { if (newTransitive == null) { newTransitive = Collections.emptySet(); } -HashSet oldNotNew1 = new HashSet(oldPrivate); +Set oldNotNew1 = new HashSet<>(oldPrivate); oldNotNew1.removeAll(newPrivate); -HashSet newNotOld1 = new HashSet(newPrivate); +Set newNotOld1 = new HashSet<>(newPrivate); newNotOld1.removeAll(oldPrivate); -HashSet oldNotNew2 = new HashSet(oldTransitive); +Set oldNotNew2 = new HashSet<>(oldTransitive); oldNotNew2.removeAll(newTransitive); -HashSet newNotOld2 = new HashSet(newTransitive); +Set newNotOld2 = new HashSet<>(newTransitive); newNotOld2.removeAll(oldTransitive); boolean privateChanged = !oldNotNew1.isEmpty() || !newNotOld1.isEmpty(); diff --git a/enterprise/j2ee.genericserver/src/org/netbeans/modules/j2ee/genericserver/ide/GSJ2eePlatformFactory.java b/enterprise/j2ee.genericserver/src/org/netbeans/modules/j2ee/genericserver/ide/GSJ2eePlatformFactory.java index c38b6b0..284f44a 100644 --- a/enterprise/j2ee.genericserver/src/org/netbeans/modules/j2ee/genericserver/ide/GSJ2eePlatformFactory.java +++ b/enterprise/j2ee.genericserver/src/org/netbeans/modules/j2ee/genericserver/ide/GSJ2eePlatformFactory.java @@ -52,13 +52,13 @@ public class GSJ2eePlatformFactory extends J2eePlatformFactory { } public Set getSupportedSpecVersions() { -Set result = new HashSet(); +Set result = new HashSet<>(); result.add(J2eeModule.J2EE_14); return result; } -public java.util.Set getSupportedModuleTypes() { -Set result = new HashSet(); +public Set getSupportedModuleTypes() { +Set result = new HashSet<>(); //result.add(J2eeModule.EAR); //result.add(J2eeModule.WAR); result.add(J2eeModule.EJB); @@ -68,7 +68,7 @@ public class GSJ2eePlatformFactory extends J2eePlatformFactory {
[jira] [Closed] (NETBEANS-5683) remove last remaining HashSet raw type warnings..
[ https://issues.apache.org/jira/browse/NETBEANS-5683?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brad Walker closed NETBEANS-5683. - > remove last remaining HashSet raw type warnings.. > - > > Key: NETBEANS-5683 > URL: https://issues.apache.org/jira/browse/NETBEANS-5683 > Project: NetBeans > Issue Type: Improvement >Reporter: Brad Walker >Assignee: Brad Walker >Priority: Major > Labels: pull-request-available > Fix For: 12.5 > > Time Spent: 0.5h > Remaining Estimate: 0h > > This change will remove the last remaining warnings about raw type HashSet. > {code:java} >[repeat] > /home/bwalker/src/netbeans/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewActionMap.java:124: > warning: [rawtypes] found raw type: HashSet >[repeat] Set keys = new HashSet(); >[repeat]^ >[repeat] missing type arguments for generic class HashSet >[repeat] where E is a type-variable: >[repeat] E extends Object declared in class HashSet > {code} > At this point, we have removed all warnings related to this.. Hooray!! -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[jira] [Resolved] (NETBEANS-5683) remove last remaining HashSet raw type warnings..
[ https://issues.apache.org/jira/browse/NETBEANS-5683?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brad Walker resolved NETBEANS-5683. --- Fix Version/s: 12.5 Resolution: Fixed fixed & merged > remove last remaining HashSet raw type warnings.. > - > > Key: NETBEANS-5683 > URL: https://issues.apache.org/jira/browse/NETBEANS-5683 > Project: NetBeans > Issue Type: Improvement >Reporter: Brad Walker >Assignee: Brad Walker >Priority: Major > Labels: pull-request-available > Fix For: 12.5 > > Time Spent: 0.5h > Remaining Estimate: 0h > > This change will remove the last remaining warnings about raw type HashSet. > {code:java} >[repeat] > /home/bwalker/src/netbeans/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewActionMap.java:124: > warning: [rawtypes] found raw type: HashSet >[repeat] Set keys = new HashSet(); >[repeat]^ >[repeat] missing type arguments for generic class HashSet >[repeat] where E is a type-variable: >[repeat] E extends Object declared in class HashSet > {code} > At this point, we have removed all warnings related to this.. Hooray!! -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[jira] [Created] (NETBEANS-5860) can't open XLSX file like XLS, no menu popup options
jose luis romero created NETBEANS-5860: -- Summary: can't open XLSX file like XLS, no menu popup options Key: NETBEANS-5860 URL: https://issues.apache.org/jira/browse/NETBEANS-5860 Project: NetBeans Issue Type: Improvement Affects Versions: 12.4 Environment: W10, Oracle JDK 1.8 Reporter: jose luis romero Attachments: image-2021-07-16-11-00-40-533.png, image-2021-07-16-11-01-04-556.png I noticed that I don't have the options to Open, Open as, Open in.. when I left click on XLSX files, like I do have on XLS files, would be good to have them too, so I don't have to leave the IDE to open them !image-2021-07-16-11-01-04-556.png! !image-2021-07-16-11-00-40-533.png! -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[jira] [Assigned] (NETBEANS-2275) Importing WSDL on Java Application, error during compile
[ https://issues.apache.org/jira/browse/NETBEANS-2275?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Roberto Cisternino reassigned NETBEANS-2275: Assignee: (was: Roberto Cisternino) > Importing WSDL on Java Application, error during compile > > > Key: NETBEANS-2275 > URL: https://issues.apache.org/jira/browse/NETBEANS-2275 > Project: NetBeans > Issue Type: Bug > Components: java - Project >Affects Versions: 9.0, 11.0, 12.0, 12.4 > Environment: Windows 10, macOS 10.15 >Reporter: David Baldo >Priority: Major > Attachments: image-2021-06-01-15-16-02-832.png > > > I've an error while trying to create a new WSDL Client in Java Application > project > Steps to reproduce: > # Create a new Java Application project > # Create new WSDL Client > # find a WSDL source (tried with my internal wsdl and > [http://www.dneonline.com/calculator.asmx?WSDL)] > # Have this error: ant -f > C:\\Users\\David\\Desktop\\Lavoro\\RedEvo\\redevoclients\\Calculator > wsimport-client-calculator > init: > wsimport-init: > Created dir: > C:\Users\David\Desktop\Lavoro\RedEvo\redevoclients\Calculator\build\generated-sources\jax-ws > C:\Users\David\Desktop\Lavoro\RedEvo\redevoclients\Calculator\nbproject\jaxws-build.xml:15: > taskdef A class needed by class com.sun.tools.ws.ant.WsImport cannot be > found: com/sun/istack/tools/ProtectedTask > using the classloader > AntClassLoader[C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\FastInfoset.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\gmbal-api-only.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\ha-api.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\javax.mail_1.4.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\jaxws-rt.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\saaj-impl.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\stax2-api.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\woodstox-core-asl.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\stax-ex.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\streambuffer.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\policy.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\management-api.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\jaxws-tools.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\mimepull.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\api\jaxws-api.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\api\jsr181-api.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\api\javax.annotation.jar;C:\netbeans-apache\netbeans9\java\modules\ext\jaxws22\api\saaj-api.jar;C:\netbeans-apache\netbeans9\ide\modules\ext\jaxb\activation.jar;C:\netbeans-apache\netbeans9\ide\modules\ext\jaxb\api\jaxb-api.jar] > BUILD FAILED (total time: 0 seconds) -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[jira] [Commented] (NETBEANS-5757) Compile-on-Save drops static initializer (vanilla javac)
[ https://issues.apache.org/jira/browse/NETBEANS-5757?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17382144#comment-17382144 ] Eirik Bakke commented on NETBEANS-5757: --- I think this will be fixed by https://github.com/apache/netbeans/pull/3054 . > Compile-on-Save drops static initializer (vanilla javac) > > > Key: NETBEANS-5757 > URL: https://issues.apache.org/jira/browse/NETBEANS-5757 > Project: NetBeans > Issue Type: Bug > Components: java - Compiler >Affects Versions: 12.4 > Environment: NetBeans 12.4 _without_ nb-javac installed (started from > clean user and cache directories to ensure no trace of nb-javac was left from > my old installation). Java 11.0.11 or Java 17-ea+25. Windows 10. >Reporter: Eirik Bakke >Priority: Major > > Very great to see Compile-on-Save now working without the external nb-javac > plugin! Here's the first bug I've found around this. To reproduce, create an > empty maven-based Java project and add the following class: > {code:java} > public class StaticInitializerExample { > private static final String SOME_CONSTANT; > static { > SOME_CONSTANT = "I am a constant."; > } > public static final void main(String args[]) { > System.out.println(SOME_CONSTANT); > } > } > {code} > Do a clean build and run. The application will print, "I am a constant." > Now do any trivial change to the code, such as adding a comment, and save. > Run again. The application will now print "null", rather than the correct > output. > Tested on both Java 11.0.11 and Java 17-ea+25. I also tested with NetBeans > 11.3 with nb-javac installed; in that case the output is correct (still "I am > a constant."). In the latter case you can also change the constant in the > static initializer, and CoS will apply the change correctly. -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: allow more dot separated digit for version scheme (#3057)
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 11c53a7 allow more dot separated digit for version scheme (#3057) 11c53a7 is described below commit 11c53a793ca6f7d22d110fca6a09bf9a407dda0b Author: Eric Barboni AuthorDate: Fri Jul 16 17:31:11 2021 +0200 allow more dot separated digit for version scheme (#3057) * allow more dot separated digit for version scheme use SpecificationVersion --- .../modules/autoupdate/pluginimporter/Installer.java | 5 - .../src/org/netbeans/upgrade/AutoUpgrade.java| 12 .../unit/src/org/netbeans/upgrade/AutoUpgradeTest.java | 16 ++-- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java index 1bb9660..410f9fa 100644 --- a/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java +++ b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java @@ -19,6 +19,7 @@ package org.netbeans.modules.autoupdate.pluginimporter; import java.io.File; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Comparator; @@ -35,6 +36,7 @@ import org.netbeans.api.autoupdate.UpdateUnitProvider; import org.netbeans.api.autoupdate.UpdateUnitProviderFactory; import org.openide.filesystems.FileUtil; import org.openide.modules.ModuleInstall; +import org.openide.modules.SpecificationVersion; import org.openide.util.NbBundle; import org.openide.util.NbPreferences; import org.openide.util.RequestProcessor; @@ -52,7 +54,8 @@ public class Installer extends ModuleInstall { private static final Logger LOG = Logger.getLogger (Installer.class.getName ()); // XXX: copy from o.n.upgrader -private static final Comparator APACHE_VERSION_COMPARATOR = (v1, v2) -> Float.compare(Float.parseFloat(v1), Float.parseFloat(v2)); + +private static final Comparator APACHE_VERSION_COMPARATOR = (v1, v2) -> new SpecificationVersion(v1).compareTo(new SpecificationVersion(v2)); private static final List APACHE_VERSION_TO_CHECK = Arrays.asList(NbBundle.getMessage(Installer.class, "apachenetbeanspreviousversion").split(",")).stream().sorted(APACHE_VERSION_COMPARATOR.reversed()).collect(Collectors.toList()); private static final List VERSION_TO_CHECK = Arrays.asList (".netbeans/7.1.2", ".netbeans/7.1.1", ".netbeans/7.1", ".netbeans/7.0", ".netbeans/6.9"); //NOI18N diff --git a/nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java index bf6e9e3..790887a 100644 --- a/nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java +++ b/nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java @@ -23,6 +23,7 @@ import java.awt.event.KeyEvent; import java.beans.PropertyVetoException; import java.io.*; import java.net.URL; +import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.Iterator; @@ -42,6 +43,7 @@ import org.openide.filesystems.LocalFileSystem; import org.openide.filesystems.MultiFileSystem; import org.openide.filesystems.XMLFileSystem; import org.openide.modules.InstalledFileLocator; +import org.openide.modules.SpecificationVersion; import org.openide.util.NbBundle; import org.openide.util.Utilities; import org.xml.sax.SAXException; @@ -91,13 +93,15 @@ public final class AutoUpgrade { // the order of VERSION_TO_CHECK here defines the precedence of imports // the first one will be choosen for import -final static private List VERSION_TO_CHECK = -Arrays.asList (new String[] { ".netbeans/7.1.2", ".netbeans/7.1.1", ".netbeans/7.1", ".netbeans/7.0", ".netbeans/6.9" });//NOI18N +private static final List VERSION_TO_CHECK = +Arrays.asList ( ".netbeans/7.1.2", ".netbeans/7.1.1", ".netbeans/7.1", ".netbeans/7.0", ".netbeans/6.9" );//NOI18N // userdir on OS specific root of userdir (see issue 196075) static final List PRE_APACHE_NEWER_VERSION_TO_CHECK = Arrays.asList ("8.2", "8.1", "8.0.2", "8.0.1", "8.0", "7.4", "7.3.1", "7.3", "7.2.1", "7.2"); //NOI18N -private static final Comparator APACHE_VERSION_COMPARATOR = (v1, v2) -> Float.compare(Float.parseFloat(v1), Float.parseFloat(v2)); + // XXX: copy to autoupgrade.pluginimporter + +static final Comparator APACHE_VERSION_COMPARATOR = (v1, v2) -> new SpecificationVersion(v1).compareTo(new SpecificationVersion(v2)); static final List APACHE_VERSION_TO_CHECK = Arrays.asList(NbBundle.getMessage(AutoUpgrade.class, "apachenetbeans
[netbeans] branch master updated: Replace the bitmap 'busy' icon with a manually drawn spinner that scales well on HiDPI/Retina screens.
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new df0cada Replace the bitmap 'busy' icon with a manually drawn spinner that scales well on HiDPI/Retina screens. new 44919c6 Merge pull request #2966 from eirikbakke/NETBEANS-5696 df0cada is described below commit df0cada60669664507d0266314d7b76728d92308 Author: Eirik Bakke AuthorDate: Sun May 16 14:51:36 2021 -0400 Replace the bitmap 'busy' icon with a manually drawn spinner that scales well on HiDPI/Retina screens. --- .../netbeans/swing/tabcontrol/plaf/BusyIcon.java | 106 + 1 file changed, 43 insertions(+), 63 deletions(-) diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BusyIcon.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BusyIcon.java index ac7edc6..7912481 100644 --- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BusyIcon.java +++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BusyIcon.java @@ -20,14 +20,10 @@ package org.netbeans.swing.tabcontrol.plaf; import java.awt.*; import java.awt.geom.AffineTransform; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.util.logging.Level; -import java.util.logging.Logger; +import java.awt.geom.Line2D; import javax.swing.Icon; import javax.swing.UIManager; import org.openide.util.ImageUtilities; -import org.openide.util.Lookup; /** * An animated icon to indicate that a tab is 'busy'. @@ -53,14 +49,9 @@ abstract class BusyIcon implements Icon { * If there is an Icon under those keys then the created instance will rotate * that Icon to animate it. * - * If there are no Icons in UIManager then there will be an attempt to create - * animated Icon based BusyPainter in SwingX library. If swingx.jar - * is available on classpath then reflection is used to create BusyPainter - * instance and paint icon animations with it. - * - * If SwingX library isn't available then the default image - * "org/netbeans/swing/tabcontrol/resources/busy_icon.png" - * will be rotated. + * If there are no icons in UIManager then a default "spinner" icon will be drawn. This default + * icon looks very similar to the JProgressBar spinner on the Aqua LAF (when used with the + * client property JProgressBar.style=circular), and will scale properly on HiDPI screens. * * * @param selectedTab Boolean to create icon for selected tab state, false @@ -68,16 +59,12 @@ abstract class BusyIcon implements Icon { * @return Animated icon. */ public static BusyIcon create( boolean selectedTab ) { -BusyIcon res = null; Icon img = UIManager.getIcon( "nb.tabcontrol.busy.icon." + (selectedTab ? "selected" : "normal") ); //NOI18N if( null != img ) { -res = new ImageBusyIcon( ImageUtilities.icon2Image( img ) ); +return new ImageBusyIcon( ImageUtilities.icon2Image( img ) ); } else { -res = SwingXBusyIcon.create(); +return VectorBusyIcon.create(); } -if( null == res ) -res = new ImageBusyIcon( ImageUtilities.loadImage( "org/netbeans/swing/tabcontrol/resources/busy_icon.png") ); //NOI18N -return res; } abstract void tick(); @@ -129,60 +116,53 @@ abstract class BusyIcon implements Icon { } } -private static class SwingXBusyIcon extends BusyIcon { - -private final Object painter; -private final Method setFrameMethod; -private final Method paintMethod; -private int currentFrame = 0; -private static final int POINTS = 8; - -private SwingXBusyIcon( Object painter, Method paint, Method setFrame, int height ) { -super( height, height ); -this.painter = painter; -this.setFrameMethod = setFrame; -this.paintMethod = paint; +private static class VectorBusyIcon extends BusyIcon { +private static final float MIN_ALPHA = 0.16f; +private static final float MAX_ALPHA = 0.89f; +private static final int ARMS = 12; +private static final float STROKE_WIDTH = 1.25f; +private static final double INNER_RADIUS = 4; +private static final double OUTER_RADIUS = 7; +private int darkestArm = 0; + +private VectorBusyIcon(int height) { +super(height, height); } public static BusyIcon create() { -Object painter = null; -ClassLoader cl = Lookup.getDefault().lookup( ClassLoader.class ); -try { -Class painterClass = cl.loadClass( "org.jdesktop.swingx.painter.BusyPainter" ); //NOI18N -
[netbeans] branch master updated: [NETBEANS-5726] Fix incorrect checkbox state shown by 'Show Editor Toolbar' and other boolean preference actions.
This is an automated email from the ASF dual-hosted git repository. ebakke pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 5f5ae6f [NETBEANS-5726] Fix incorrect checkbox state shown by 'Show Editor Toolbar' and other boolean preference actions. 5f5ae6f is described below commit 5f5ae6f574c59b6f3541e1a7b434064c00de131d Author: Eirik Bakke AuthorDate: Fri May 28 12:21:29 2021 -0400 [NETBEANS-5726] Fix incorrect checkbox state shown by 'Show Editor Toolbar' and other boolean preference actions. --- .../modules/editor/actions/ToggleAction.java | 59 +- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/ide/editor.actions/src/org/netbeans/modules/editor/actions/ToggleAction.java b/ide/editor.actions/src/org/netbeans/modules/editor/actions/ToggleAction.java index 3666dfe..1f5eb7e 100644 --- a/ide/editor.actions/src/org/netbeans/modules/editor/actions/ToggleAction.java +++ b/ide/editor.actions/src/org/netbeans/modules/editor/actions/ToggleAction.java @@ -20,6 +20,7 @@ package org.netbeans.modules.editor.actions; import java.awt.event.ActionEvent; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.text.JTextComponent; @@ -34,35 +35,47 @@ import org.netbeans.api.editor.EditorActionNames; * * @author Miloslav Metelka */ -@EditorActionRegistrations({ -@EditorActionRegistration( -name = EditorActionNames.toggleToolbar, -menuPath = "View", -menuPosition = 800, -menuText = "#" + EditorActionNames.toggleToolbar + "_menu_text", -preferencesKey = SimpleValueNames.TOOLBAR_VISIBLE_PROP -), -@EditorActionRegistration( -name = EditorActionNames.toggleLineNumbers, -menuPath = "View", -menuPosition = 850, -menuText = "#" + EditorActionNames.toggleLineNumbers + "_menu_text", -preferencesKey = SimpleValueNames.LINE_NUMBER_VISIBLE -), -@EditorActionRegistration( -name = EditorActionNames.toggleNonPrintableCharacters, -menuPath = "View", -menuPosition = 870, -menuText = "#" + EditorActionNames.toggleNonPrintableCharacters + "_menu_text", -preferencesKey = SimpleValueNames.NON_PRINTABLE_CHARACTERS_VISIBLE -) -}) public final class ToggleAction extends AbstractEditorAction { +/* Use eager initialization for these actions. Otherwise the selection ("checked") state of menu +items will not properly track the respective Preferences value (NETBEANS-5726). */ +@EditorActionRegistrations({ +@EditorActionRegistration( +name = EditorActionNames.toggleToolbar, +menuPath = "View", +menuPosition = 800, +menuText = "#" + EditorActionNames.toggleToolbar + "_menu_text", +preferencesKey = SimpleValueNames.TOOLBAR_VISIBLE_PROP +), +@EditorActionRegistration( +name = EditorActionNames.toggleLineNumbers, +menuPath = "View", +menuPosition = 850, +menuText = "#" + EditorActionNames.toggleLineNumbers + "_menu_text", +preferencesKey = SimpleValueNames.LINE_NUMBER_VISIBLE +), +@EditorActionRegistration( +name = EditorActionNames.toggleNonPrintableCharacters, +menuPath = "View", +menuPosition = 870, +menuText = "#" + EditorActionNames.toggleNonPrintableCharacters + "_menu_text", +preferencesKey = SimpleValueNames.NON_PRINTABLE_CHARACTERS_VISIBLE +) +}) +public static ToggleAction create(Map attrs) { +return new ToggleAction(attrs); +} private static final Logger LOG = Logger.getLogger(ToggleAction.class.getName()); private static final long serialVersionUID = 1L; +public ToggleAction() { +} + +private ToggleAction(Map attrs) { +super(attrs); +} + @Override public void actionPerformed(ActionEvent evt, JTextComponent component) { // Leave empty - AlwaysEnabledAction toggles state in preferences by default - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists