This is an automated email from the ASF dual-hosted git repository.
mklaehn 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 ef920f5 Use the blessed modifier order in projects located in javafx
projects
ef920f5 is described below
commit ef920f5e897086a8d5b1e995509459d37ea08cbd
Author: Martin Klähn <[email protected]>
AuthorDate: Thu Feb 17 22:41:58 2022 +0100
Use the blessed modifier order in projects located in javafx projects
---
.../javafx2/editor/completion/beans/FxBean.java | 2 +-
.../editor/completion/impl/ClassCompleter.java | 2 +-
.../modules/javafx2/editor/spi/FXMLOpener.java | 6 ++---
.../javafx2/project/ui/RuntimeComboBox.java | 20 +++++++--------
.../scenebuilder/SceneBuilderFXMLOpener.java | 2 +-
.../modules/javafx2/scenebuilder/Settings.java | 6 ++---
.../javafx2/scenebuilder/impl/SBHomeFactory.java | 6 ++---
.../scenebuilder/options/GrowingComboBox.java | 30 +++++++++++-----------
.../scenebuilder/options/SBOptionsPanel.java | 4 +--
.../options/SBOptionsPanelController.java | 4 +--
10 files changed, 41 insertions(+), 41 deletions(-)
diff --git
a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/beans/FxBean.java
b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/beans/FxBean.java
index fd0b96c..df9eb98 100644
---
a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/beans/FxBean.java
+++
b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/beans/FxBean.java
@@ -173,7 +173,7 @@ public final class FxBean extends FxDefinition {
/**
* Provides names of all factory methods. Factory method is, per JavaFX
guide,
- * a static public method on the class, which returns the class itself.
+ * a public static method on the class, which returns the class itself.
*
* @return all factory methods
*/
diff --git
a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/impl/ClassCompleter.java
b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/impl/ClassCompleter.java
index f7ea5a9..615e19f 100644
---
a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/impl/ClassCompleter.java
+++
b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/impl/ClassCompleter.java
@@ -62,7 +62,7 @@ import org.netbeans.spi.editor.completion.CompletionProvider;
* @author sdedic
*/
@MimeRegistration(mimeType=JavaFXEditorUtils.FXML_MIME_TYPE,
service=Completer.Factory.class)
-final public class ClassCompleter implements Completer, Completer.Factory {
+public final class ClassCompleter implements Completer, Completer.Factory {
private static final Logger LOG =
Logger.getLogger(ClassCompleter.class.getName());
private static final int IMPORTED_PRIORITY = 50;
diff --git
a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/spi/FXMLOpener.java
b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/spi/FXMLOpener.java
index 18c9cdc..05f8b97 100644
---
a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/spi/FXMLOpener.java
+++
b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/spi/FXMLOpener.java
@@ -27,7 +27,7 @@ import org.openide.util.Lookup;
*
* @since 1.3.1
*/
-abstract public class FXMLOpener {
- abstract public boolean isEnabled(Lookup context);
- abstract public boolean open(Lookup context);
+public abstract class FXMLOpener {
+ public abstract boolean isEnabled(Lookup context);
+ public abstract boolean open(Lookup context);
}
diff --git
a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/RuntimeComboBox.java
b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/RuntimeComboBox.java
index 47c441f..b633766 100644
---
a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/RuntimeComboBox.java
+++
b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/RuntimeComboBox.java
@@ -292,11 +292,11 @@ public class RuntimeComboBox extends javax.swing.JPanel {
getModel().setGrowAction(growAction);
}
- final public static class RuntimeListModel<T> implements ComboBoxModel {
+ public static final class RuntimeListModel<T> implements ComboBoxModel {
- final private Set<ListDataListener> listeners = new
CopyOnWriteArraySet<ListDataListener>();
- final private List<T> predefinedList = new ArrayList<T>();
- final private List<T> userList = new ArrayList<T>();
+ private final Set<ListDataListener> listeners = new
CopyOnWriteArraySet<ListDataListener>();
+ private final List<T> predefinedList = new ArrayList<T>();
+ private final List<T> userList = new ArrayList<T>();
private T selected = null;
private Action growAction;
@@ -372,11 +372,11 @@ public class RuntimeComboBox extends javax.swing.JPanel {
listeners.remove(l);
}
- final public List<T> getPredefined() {
+ public final List<T> getPredefined() {
return Collections.unmodifiableList(predefinedList);
}
- final public List<T> getUserDefined() {
+ public final List<T> getUserDefined() {
return Collections.unmodifiableList(userList);
}
@@ -400,7 +400,7 @@ public class RuntimeComboBox extends javax.swing.JPanel {
}
}
- final public void setPredefined(T ... predefined) {
+ public final void setPredefined(T ... predefined) {
int stop;
if(!predefinedList.isEmpty()) {
stop = predefinedList.size();
@@ -413,7 +413,7 @@ public class RuntimeComboBox extends javax.swing.JPanel {
fireDataAdded(0, stop);
}
- final public void setUserDefined(T ... user) {
+ public final void setUserDefined(T ... user) {
int stop;
int start = predefinedList.isEmpty() ? 0 : predefinedList.size();
if(!userList.isEmpty()) {
@@ -427,7 +427,7 @@ public class RuntimeComboBox extends javax.swing.JPanel {
fireDataAdded(start, start + stop);
}
- final public void addPredefined(T ... predefined) {
+ public final void addPredefined(T ... predefined) {
int stop1 = predefinedList.isEmpty() ? 0 : predefinedList.size();
predefinedList.addAll(Arrays.asList(predefined));
int stop2 = predefinedList.isEmpty() ? 0 : predefinedList.size();
@@ -435,7 +435,7 @@ public class RuntimeComboBox extends javax.swing.JPanel {
fireDataAdded(stop1, stop2);
}
- final public void addUserDefined(T ... userdefined) {
+ public final void addUserDefined(T ... userdefined) {
int start = predefinedList.isEmpty() ? 0 : predefinedList.size();
int stop1 = userList.isEmpty() ? 0 : userList.size();
userList.addAll(Arrays.asList(userdefined));
diff --git
a/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/SceneBuilderFXMLOpener.java
b/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/SceneBuilderFXMLOpener.java
index 6771c0f..be46d22 100644
---
a/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/SceneBuilderFXMLOpener.java
+++
b/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/SceneBuilderFXMLOpener.java
@@ -38,7 +38,7 @@ import org.openide.util.lookup.ServiceProvider;
* Opens an FXML file in SceneBuilder instance if available.
*/
public final class SceneBuilderFXMLOpener extends FXMLOpener {
- final private static Logger LOG =
Logger.getLogger(SceneBuilderFXMLOpener.class.getName());
+ private static final Logger LOG =
Logger.getLogger(SceneBuilderFXMLOpener.class.getName());
private Settings settings = Settings.getInstance();
@Override
diff --git
a/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/Settings.java
b/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/Settings.java
index af09288..3e89e12 100644
---
a/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/Settings.java
+++
b/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/Settings.java
@@ -32,7 +32,7 @@ import org.openide.util.NbPreferences;
*
* @author Jaroslav Bachorik <[email protected]>
*/
-final public class Settings {
+public final class Settings {
private static final String SAVE_BEFORE_LAUNCH = "saveBeforeLaunch";
private static final String SELECTED_HOME = "selectedHome";
private static final String USER_DEFINED_HOMES = "userDefinedHomes";
@@ -47,10 +47,10 @@ final public class Settings {
}
private static class Singleton {
- final private static Settings INSTANCE = new Settings();
+ private static final Settings INSTANCE = new Settings();
}
- static public Settings getInstance() {
+ public static Settings getInstance() {
return Singleton.INSTANCE;
}
diff --git
a/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/impl/SBHomeFactory.java
b/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/impl/SBHomeFactory.java
index 6ce9405..6c9128b 100644
---
a/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/impl/SBHomeFactory.java
+++
b/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/impl/SBHomeFactory.java
@@ -103,9 +103,9 @@ public class SBHomeFactory {
* See Bundle.properties for OS specific definitions
*/
private static final class HomeFactoryCommon implements HomeFactory {
- final private List<String> WKIP;
- final private List<String> LAUNCHER_PATH;
- final private List<String> PROPERTIES_PATH;
+ private final List<String> WKIP;
+ private final List<String> LAUNCHER_PATH;
+ private final List<String> PROPERTIES_PATH;
HomeFactoryCommon(List<String> WKIP, List<String> LAUNCHER_PATH,
List<String> PROPERTIES_PATH) {
Parameters.notNull("WKIP", WKIP); //NOI18N
diff --git
a/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/GrowingComboBox.java
b/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/GrowingComboBox.java
index 69a2cef..78bf722 100644
---
a/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/GrowingComboBox.java
+++
b/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/GrowingComboBox.java
@@ -38,9 +38,9 @@ import javax.swing.event.PopupMenuListener;
public class GrowingComboBox extends javax.swing.JPanel {
private static final String SEPARATOR = "---";
public static final class GrowingListModel<T> implements
ComboBoxModel<Object> {
- final private Set<ListDataListener> listeners = new
CopyOnWriteArraySet<ListDataListener>();
- final private List<T> predefinedList = new ArrayList<T>();
- final private List<T> userList = new ArrayList<T>();
+ private final Set<ListDataListener> listeners = new
CopyOnWriteArraySet<ListDataListener>();
+ private final List<T> predefinedList = new ArrayList<T>();
+ private final List<T> userList = new ArrayList<T>();
private T selected = null;
private Action growAction;
@@ -64,13 +64,13 @@ public class GrowingComboBox extends javax.swing.JPanel {
}
@Override
- final public Object getSelectedItem() {
+ public final Object getSelectedItem() {
return selected;
}
@Override
@SuppressWarnings("unchecked")
- final public void setSelectedItem(final Object anItem) {
+ public final void setSelectedItem(final Object anItem) {
if (anItem != null) {
if (anItem.equals(SEPARATOR)) return;
if (anItem instanceof Action) {
@@ -89,12 +89,12 @@ public class GrowingComboBox extends javax.swing.JPanel {
}
@Override
- final public void addListDataListener(ListDataListener l) {
+ public final void addListDataListener(ListDataListener l) {
listeners.add(l);
}
@Override
- final public Object getElementAt(int index) {
+ public final Object getElementAt(int index) {
int sep1 = getSep1Pos();
int sep2 = getSep2Pos();
@@ -112,24 +112,24 @@ public class GrowingComboBox extends javax.swing.JPanel {
}
@Override
- final public int getSize() {
+ public final int getSize() {
return getActionPos() + 1;
}
@Override
- final public void removeListDataListener(ListDataListener l) {
+ public final void removeListDataListener(ListDataListener l) {
listeners.remove(l);
}
- final public List<T> getPredefined() {
+ public final List<T> getPredefined() {
return Collections.unmodifiableList(predefinedList);
}
- final public List<T> getUserDefined() {
+ public final List<T> getUserDefined() {
return Collections.unmodifiableList(userList);
}
- final public void setPredefined(List<T> predefined) {
+ public final void setPredefined(List<T> predefined) {
int stop = getSep1Pos();
predefinedList.clear();
if (stop > 0) {
@@ -141,7 +141,7 @@ public class GrowingComboBox extends javax.swing.JPanel {
fireDataAdded(0, stop > 0 ? stop : 0);
}
- final public void setUserDefined(List<T> user) {
+ public final void setUserDefined(List<T> user) {
int stop = getSep2Pos();
userList.clear();
if (stop > 0) {
@@ -153,7 +153,7 @@ public class GrowingComboBox extends javax.swing.JPanel {
fireDataAdded(getUserListStartPos(), stop);
}
- final public void addPredefined(T ... predefined) {
+ public final void addPredefined(T ... predefined) {
int stop1 = getSep1Pos();
predefinedList.addAll(Arrays.asList(predefined));
int stop2 = getSep1Pos();
@@ -161,7 +161,7 @@ public class GrowingComboBox extends javax.swing.JPanel {
fireDataAdded(stop1 > -1 ? stop1 : 0, stop2);
}
- final public void addUserDefined(T ... userdefined) {
+ public final void addUserDefined(T ... userdefined) {
int stop1 = getSep2Pos();
userList.addAll(Arrays.asList(userdefined));
int stop2 = getSep2Pos();
diff --git
a/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanel.java
b/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanel.java
index 9d38223..54e20ad 100644
---
a/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanel.java
+++
b/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanel.java
@@ -80,8 +80,8 @@ final class SBOptionsPanel extends javax.swing.JPanel {
}
}
- final private List<HomeDef> userDefinedSBHomes = new ArrayList<HomeDef>();
- final private List<HomeDef> predefinedSBHomes = new ArrayList<HomeDef>();
+ private final List<HomeDef> userDefinedSBHomes = new ArrayList<HomeDef>();
+ private final List<HomeDef> predefinedSBHomes = new ArrayList<HomeDef>();
@NbBundle.Messages({
"MSG_InvalidHome=Please, select a valid Scene Builder home...",
diff --git
a/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanelController.java
b/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanelController.java
index fa7b427..ea5fcc4 100644
---
a/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanelController.java
+++
b/javafx/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanelController.java
@@ -37,8 +37,8 @@ keywordsCategory = JavaOptions.JAVA + "/JavaFX",
id=SBOptionsPanelController.SUBREG_ID)
@org.openide.util.NbBundle.Messages({"AdvancedOption_DisplayName_SB=JavaFX",
"AdvancedOption_Keywords_SB=javafx"})
public final class SBOptionsPanelController extends OptionsPanelController {
- final public static String SUBREG_CAT = JavaOptions.JAVA;
- final public static String SUBREG_ID = "SceneBuilder"; // NOI18N
+ public static final String SUBREG_CAT = JavaOptions.JAVA;
+ public static final String SUBREG_ID = "SceneBuilder"; // NOI18N
private SBOptionsPanel panel;
private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
private boolean changed;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
