Browse Source

Added some generics and removed usages of deprecated methods

Toni Helenius 5 years ago
parent
commit
30f25aad6f

+ 1 - 1
jme3-assetpack-support/src/com/jme3/gde/assetpack/online/MultiPartFormOutputStream.java

@@ -139,7 +139,7 @@ public class MultiPartFormOutputStream {
      */
     public void writeField(String name, char value)
             throws java.io.IOException {
-        writeField(name, new Character(value).toString());
+        writeField(name, Character.valueOf(value).toString());
     }
 
     /**

+ 1 - 1
jme3-glsl-highlighter/src/com/jme3/gde/glsl/highlighter/GlslLanguage.java

@@ -45,7 +45,7 @@ import org.netbeans.modules.csl.spi.LanguageRegistration;
 public class GlslLanguage extends DefaultLanguageConfig {
 
     @Override
-    public Language getLexerLanguage() {
+    public Language<GlslTokenID> getLexerLanguage() {
         return new GlslLanguageHierarchy().language();
     }
 

+ 2 - 2
jme3-glsl-highlighter/src/com/jme3/gde/glsl/highlighter/lexer/GlslLexer.java

@@ -46,12 +46,12 @@ import org.netbeans.spi.lexer.TokenFactory;
 public class GlslLexer implements Lexer<GlslTokenID> {
 
     private final LexerInput lexerInput;
-    private final TokenFactory tokenFactory;
+    private final TokenFactory<GlslTokenID> tokenFactory;
     private final Logger log = Logger.getLogger(this.getClass().getCanonicalName());
 
     private String thisLineSoFar = "";
 
-    public GlslLexer(LexerRestartInfo info) {
+    public GlslLexer(LexerRestartInfo<GlslTokenID> info) {
         lexerInput = info.input();
         tokenFactory = info.tokenFactory();
     }

+ 3 - 0
jme3-ios/src/com/jme3/gde/ios/panel/IosCustomizerPanel.form

@@ -84,6 +84,9 @@
           </StringArray>
         </Property>
       </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>

+ 5 - 5
jme3-ios/src/com/jme3/gde/ios/panel/IosCustomizerPanel.java

@@ -79,14 +79,14 @@ public class IosCustomizerPanel extends javax.swing.JPanel implements ActionList
     private void saveProperties() {
         //TODO: check properties
         properties.setProperty("ios.enabled", "" + jCheckBox1.isSelected());
-        String version = (String) jComboBox1.getSelectedItem();
+        String version = jComboBox1.getItemAt(jComboBox1.getSelectedIndex());
         properties.setProperty("ios.version", version);
         properties.setProperty("delete.folder", "" + jCheckBox2.isSelected());
     }
 
     private void setSelected(String name) {
         for (int i = 0; i < jComboBox1.getItemCount(); i++) {
-            String target = (String) jComboBox1.getItemAt(i);
+            String target = jComboBox1.getItemAt(i);
             if (target.equals(name)) {
                 jComboBox1.setSelectedIndex(i);
                 return;
@@ -109,7 +109,7 @@ public class IosCustomizerPanel extends javax.swing.JPanel implements ActionList
     private void initComponents() {
 
         jCheckBox1 = new javax.swing.JCheckBox();
-        jComboBox1 = new javax.swing.JComboBox();
+        jComboBox1 = new javax.swing.JComboBox<>();
         jLabel1 = new javax.swing.JLabel();
         jCheckBox2 = new javax.swing.JCheckBox();
         jTextField1 = new javax.swing.JTextField();
@@ -119,7 +119,7 @@ public class IosCustomizerPanel extends javax.swing.JPanel implements ActionList
 
         jCheckBox1.setText(org.openide.util.NbBundle.getMessage(IosCustomizerPanel.class, "IosCustomizerPanel.jCheckBox1.text")); // NOI18N
 
-        jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        jComboBox1.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
 
         jLabel1.setText(org.openide.util.NbBundle.getMessage(IosCustomizerPanel.class, "IosCustomizerPanel.jLabel1.text")); // NOI18N
 
@@ -184,7 +184,7 @@ public class IosCustomizerPanel extends javax.swing.JPanel implements ActionList
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JCheckBox jCheckBox1;
     private javax.swing.JCheckBox jCheckBox2;
-    private javax.swing.JComboBox jComboBox1;
+    private javax.swing.JComboBox<String> jComboBox1;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel2;
     private javax.swing.JScrollPane jScrollPane1;

+ 4 - 6
jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorToolBar.form

@@ -59,17 +59,15 @@
     <Component class="javax.swing.JComboBox" name="techniqueComboBox">
       <Properties>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="4">
-            <StringItem index="0" value="Item 1"/>
-            <StringItem index="1" value="Item 2"/>
-            <StringItem index="2" value="Item 3"/>
-            <StringItem index="3" value="Item 4"/>
-          </StringArray>
+          <StringArray count="0"/>
         </Property>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="techniqueComboBoxActionPerformed"/>
       </Events>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;TechniqueBlock&gt;"/>
+      </AuxValues>
     </Component>
     <Component class="javax.swing.JButton" name="jButton1">
       <Properties>

+ 5 - 4
jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorToolBar.java

@@ -62,12 +62,14 @@ public class MatDefEditorToolBar extends JPanel {
         techniqueComboBox.setModel(comboModel);
         final DefaultListCellRenderer renderer = new DefaultListCellRenderer();
         techniqueComboBox.setRenderer(new ListCellRenderer<TechniqueBlock>() {
+            
             @Override
-            public Component getListCellRendererComponent(JList list, TechniqueBlock value, int index, boolean isSelected, boolean cellHasFocus) {
+            public Component getListCellRendererComponent(JList<? extends TechniqueBlock> list, TechniqueBlock value, int index, boolean isSelected, boolean cellHasFocus) {
                 JLabel c = (JLabel) renderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
                 c.setText(value.getName());
                 return c;
             }
+            
         });
 
     }
@@ -95,7 +97,7 @@ public class MatDefEditorToolBar extends JPanel {
     private void initComponents() {
 
         jLabel1 = new javax.swing.JLabel();
-        techniqueComboBox = new javax.swing.JComboBox();
+        techniqueComboBox = new javax.swing.JComboBox<>();
         jButton1 = new javax.swing.JButton();
         jSeparator1 = new javax.swing.JSeparator();
         jButton2 = new javax.swing.JButton();
@@ -105,7 +107,6 @@ public class MatDefEditorToolBar extends JPanel {
         jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(MatDefEditorToolBar.class, "MatDefEditorToolBar.jLabel1.text")); // NOI18N
 
-        techniqueComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
         techniqueComboBox.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 techniqueComboBoxActionPerformed(evt);
@@ -196,6 +197,6 @@ public class MatDefEditorToolBar extends JPanel {
     private javax.swing.JButton jButton2;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JSeparator jSeparator1;
-    private javax.swing.JComboBox techniqueComboBox;
+    private javax.swing.JComboBox<TechniqueBlock> techniqueComboBox;
     // End of variables declaration//GEN-END:variables
 }

+ 2 - 2
jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorRGBADialog.java

@@ -60,7 +60,7 @@ public class ColorRGBADialog extends javax.swing.JDialog {
         float[] floats = new float[4];
         jColorChooser1.getColor().getComponents(floats);
         color = new Color(floats[0], floats[1], floats[2], ((float) alphaSlider.getValue()) / 100.0f);
-        String str = new String(floats[0] + " " + floats[1] + " " + floats[2] + " " + ((float) alphaSlider.getValue()) / 100.0f);
+        String str = floats[0] + " " + floats[1] + " " + floats[2] + " " + ((float) alphaSlider.getValue()) / 100.0f;
         strColor = str;
     }
 
@@ -169,7 +169,7 @@ public class ColorRGBADialog extends javax.swing.JDialog {
             this.color = color;
             jColorChooser1.setColor(color);
 
-            alphaSlider.setValue((int) ((float) (color.getAlpha() / 255f) * 100));
+            alphaSlider.setValue((int) ((color.getAlpha() / 255f) * 100));
         }
 
     }

+ 5 - 1
jme3-materialeditor/src/com/jme3/gde/materials/nvcompress/NVCompress.form

@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
   <NonVisualComponents>
@@ -47,6 +47,7 @@
   <SyntheticProperties>
     <SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <Events>
     <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowClosing"/>
@@ -292,6 +293,9 @@
           <Events>
             <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="lstFileListKeyTyped"/>
           </Events>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;File&gt;"/>
+          </AuxValues>
         </Component>
       </SubComponents>
     </Container>

+ 11 - 11
jme3-materialeditor/src/com/jme3/gde/materials/nvcompress/NVCompress.java

@@ -92,7 +92,7 @@ public class NVCompress extends javax.swing.JFrame {
         lblCompressType = new javax.swing.JLabel();
         chkCuda = new javax.swing.JCheckBox();
         sclFileList = new javax.swing.JScrollPane();
-        lstFileList = new javax.swing.JList();
+        lstFileList = new javax.swing.JList<>();
         btnAddFiles = new javax.swing.JButton();
         btnRemoveFiles = new javax.swing.JButton();
         pnlExportOpt = new javax.swing.JPanel();
@@ -356,7 +356,7 @@ public class NVCompress extends javax.swing.JFrame {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(barProgress, javax.swing.GroupLayout.DEFAULT_SIZE, 30, Short.MAX_VALUE)
-                    .addComponent(btnRemoveFiles, javax.swing.GroupLayout.PREFERRED_SIZE, 24, Short.MAX_VALUE)
+                    .addComponent(btnRemoveFiles, javax.swing.GroupLayout.DEFAULT_SIZE, 24, Short.MAX_VALUE)
                     .addComponent(btnAddFiles, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addContainerGap())
         );
@@ -574,13 +574,13 @@ public class NVCompress extends javax.swing.JFrame {
     }
 
     private Object[] compileFileList(){
-        Object[] values = lstFileList.getSelectedValues();
-        if (values == null || values.length == 0){
+        List<File> values = lstFileList.getSelectedValuesList();
+        if (values == null || values.isEmpty()){
             // no specific files selected, add all of them
-            DefaultListModel listModel = (DefaultListModel) lstFileList.getModel();
-            values = listModel.toArray();
+            DefaultListModel<File> listModel = (DefaultListModel) lstFileList.getModel();
+            return listModel.toArray();
         }
-        return values;
+        return values.toArray();
     }
 
     private void runNVCompressAll(final File exportDir){
@@ -749,9 +749,9 @@ public class NVCompress extends javax.swing.JFrame {
     }//GEN-LAST:event_btnAddFilesActionPerformed
 
     private void btnRemoveFilesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRemoveFilesActionPerformed
-        Object[] selected = lstFileList.getSelectedValues();
-        DefaultListModel listModel = (DefaultListModel) lstFileList.getModel();
-        for (Object val : selected){
+        List<File> selected = lstFileList.getSelectedValuesList();
+        DefaultListModel<File> listModel = (DefaultListModel) lstFileList.getModel();
+        for (File val : selected){
             listModel.removeElement(val);
         }
     }//GEN-LAST:event_btnRemoveFilesActionPerformed
@@ -895,7 +895,7 @@ public class NVCompress extends javax.swing.JFrame {
     private javax.swing.JLabel lblCompressType;
     private javax.swing.JLabel lblMapType;
     private javax.swing.JLabel lblTargetDir;
-    private javax.swing.JList lstFileList;
+    private javax.swing.JList<File> lstFileList;
     private javax.swing.JMenuItem menuAbout;
     private javax.swing.JMenu menuFile;
     private javax.swing.JMenu menuHelp;

+ 9 - 16
jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form

@@ -84,15 +84,10 @@
                   </Group>
                   <EmptySpace min="-2" pref="34" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="102" alignment="0" attributes="0">
-                          <Component id="jLabel12" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace min="-2" pref="105" max="-2" attributes="0"/>
-                      </Group>
-                      <Group type="102" alignment="0" attributes="0">
-                          <Component id="jLabel11" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace pref="105" max="-2" attributes="0"/>
-                      </Group>
+                      <Component id="jLabel12" alignment="0" min="-2" max="-2" attributes="0"/>
+                      <Component id="jLabel11" alignment="0" min="-2" max="-2" attributes="0"/>
                   </Group>
+                  <EmptySpace max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -102,15 +97,10 @@
                   <Component id="sceneInfoLabel1" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="sceneInfoLabel2" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="1" attributes="0">
-                      <Group type="102" alignment="1" attributes="0">
-                          <EmptySpace min="4" pref="4" max="-2" attributes="0"/>
-                          <Group type="103" groupAlignment="1" attributes="0">
-                              <Component id="jSlider1" min="-2" max="-2" attributes="0"/>
-                              <Component id="jLabel7" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                      </Group>
+                      <Component id="jSlider1" min="-2" max="-2" attributes="0"/>
+                      <Component id="jLabel7" min="-2" max="-2" attributes="0"/>
                       <Component id="jSpinner1" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
@@ -262,6 +252,9 @@
           <Events>
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="transformationTypeComboBoxActionPerformed"/>
           </Events>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+          </AuxValues>
         </Component>
         <Component class="javax.swing.JToolBar$Separator" name="jSeparator9">
         </Component>

+ 16 - 21
jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java

@@ -35,11 +35,6 @@ import java.util.logging.Logger;
 import javax.swing.ButtonGroup;
 import javax.swing.border.TitledBorder;
 import org.netbeans.api.progress.ProgressHandle;
-import org.openide.util.Exceptions;
-import org.openide.util.NbBundle;
-import org.openide.windows.TopComponent;
-import org.openide.windows.WindowManager;
-import org.openide.util.ImageUtilities;
 import org.netbeans.api.settings.ConvertAsProperties;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
@@ -49,12 +44,17 @@ import org.openide.awt.Toolbar;
 import org.openide.awt.ToolbarPool;
 import org.openide.awt.UndoRedo;
 import org.openide.filesystems.FileObject;
+import org.openide.util.Exceptions;
 import org.openide.util.HelpCtx;
+import org.openide.util.ImageUtilities;
 import org.openide.util.Lookup;
 import org.openide.util.Lookup.Result;
 import org.openide.util.LookupEvent;
 import org.openide.util.LookupListener;
+import org.openide.util.NbBundle;
 import org.openide.util.Utilities;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
 
 /**
  * TODO: some threading stuff
@@ -112,7 +112,7 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce
         jLabel11 = new javax.swing.JLabel();
         jLabel12 = new javax.swing.JLabel();
         jToolBar1 = new javax.swing.JToolBar();
-        transformationTypeComboBox = new javax.swing.JComboBox();
+        transformationTypeComboBox = new javax.swing.JComboBox<>();
         jSeparator9 = new javax.swing.JToolBar.Separator();
         selectButton = new javax.swing.JToggleButton();
         moveButton = new javax.swing.JToggleButton();
@@ -231,12 +231,9 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce
                     .addComponent(jLabel10))
                 .addGap(34, 34, 34)
                 .addGroup(sceneInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(sceneInfoPanelLayout.createSequentialGroup()
-                        .addComponent(jLabel12)
-                        .addGap(105, 105, 105))
-                    .addGroup(sceneInfoPanelLayout.createSequentialGroup()
-                        .addComponent(jLabel11)
-                        .addContainerGap(105, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                    .addComponent(jLabel12)
+                    .addComponent(jLabel11))
+                .addContainerGap())
         );
         sceneInfoPanelLayout.setVerticalGroup(
             sceneInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -244,13 +241,10 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce
                 .addComponent(sceneInfoLabel1)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(sceneInfoLabel2)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGap(5, 5, 5)
                 .addGroup(sceneInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addGroup(sceneInfoPanelLayout.createSequentialGroup()
-                        .addGap(4, 4, 4)
-                        .addGroup(sceneInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                            .addComponent(jSlider1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(jLabel7)))
+                    .addComponent(jSlider1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel7)
                     .addComponent(jSpinner1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(sceneInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
@@ -274,7 +268,7 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce
         jToolBar1.setFloatable(false);
         jToolBar1.setRollover(true);
 
-        transformationTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Local", "Global", "Camera" }));
+        transformationTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Local", "Global", "Camera" }));
         transformationTypeComboBox.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.transformationTypeComboBox.toolTipText")); // NOI18N
         transformationTypeComboBox.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -724,6 +718,7 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce
 private void emitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_emitButtonActionPerformed
     SceneApplication.getApplication().enqueue(new Callable<Object>() {
 
+        @Override
         public Object call() throws Exception {
             emit(editorController.getSelectedSpat());
             return null;
@@ -767,7 +762,7 @@ private void jToggleSelectGeomActionPerformed(java.awt.event.ActionEvent evt) {/
 }//GEN-LAST:event_jToggleSelectGeomActionPerformed
 
     private void transformationTypeComboBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_transformationTypeComboBoxActionPerformed
-        toolController.setTransformationType((String) transformationTypeComboBox.getSelectedItem());
+        toolController.setTransformationType(transformationTypeComboBox.getItemAt(transformationTypeComboBox.getSelectedIndex()));
     }//GEN-LAST:event_transformationTypeComboBoxActionPerformed
 
     private void jSlider1StateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_jSlider1StateChanged
@@ -880,7 +875,7 @@ private void jToggleSelectGeomActionPerformed(java.awt.event.ActionEvent evt) {/
     private javax.swing.JToggleButton showGridToggleButton;
     private javax.swing.JToggleButton showSelectionToggleButton;
     private javax.swing.ButtonGroup spatialModButtonGroup;
-    private javax.swing.JComboBox transformationTypeComboBox;
+    private javax.swing.JComboBox<String> transformationTypeComboBox;
     // End of variables declaration//GEN-END:variables
 
     private void emit(Spatial root) {

+ 5 - 2
jme3-templates/src/com/jme3/gde/templates/basic/BasicGamePanelVisual.java

@@ -18,7 +18,7 @@ import org.openide.filesystems.FileUtil;
 public class BasicGamePanelVisual extends JPanel implements DocumentListener {
 
     public static final String PROP_PROJECT_NAME = "projectName";
-    private BasicGameWizardPanel panel;
+    private final BasicGameWizardPanel panel;
 
     public BasicGamePanelVisual(BasicGameWizardPanel panel) {
         initComponents();
@@ -110,7 +110,7 @@ public class BasicGamePanelVisual extends JPanel implements DocumentListener {
         String command = evt.getActionCommand();
         if ("BROWSE".equals(command)) {
             JFileChooser chooser = new JFileChooser();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
+            chooser.setCurrentDirectory(null);
             chooser.setDialogTitle("Select Project Location");
             chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             String path = this.projectLocationTextField.getText();
@@ -218,6 +218,7 @@ public class BasicGamePanelVisual extends JPanel implements DocumentListener {
     }
 
     // Implementation of DocumentListener --------------------------------------
+    @Override
     public void changedUpdate(DocumentEvent e) {
         updateTexts(e);
         if (this.projectNameTextField.getDocument() == e.getDocument()) {
@@ -225,6 +226,7 @@ public class BasicGamePanelVisual extends JPanel implements DocumentListener {
         }
     }
 
+    @Override
     public void insertUpdate(DocumentEvent e) {
         updateTexts(e);
         if (this.projectNameTextField.getDocument() == e.getDocument()) {
@@ -232,6 +234,7 @@ public class BasicGamePanelVisual extends JPanel implements DocumentListener {
         }
     }
 
+    @Override
     public void removeUpdate(DocumentEvent e) {
         updateTexts(e);
         if (this.projectNameTextField.getDocument() == e.getDocument()) {

+ 5 - 2
jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidPanelVisual.java

@@ -18,7 +18,7 @@ import org.openide.filesystems.FileUtil;
 public class JME3TestsAndroidPanelVisual extends JPanel implements DocumentListener {
 
     public static final String PROP_PROJECT_NAME = "projectName";
-    private JME3TestsAndroidWizardPanel panel;
+    private final JME3TestsAndroidWizardPanel panel;
 
     public JME3TestsAndroidPanelVisual(JME3TestsAndroidWizardPanel panel) {
         initComponents();
@@ -110,7 +110,7 @@ public class JME3TestsAndroidPanelVisual extends JPanel implements DocumentListe
         String command = evt.getActionCommand();
         if ("BROWSE".equals(command)) {
             JFileChooser chooser = new JFileChooser();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
+            chooser.setCurrentDirectory(null);
             chooser.setDialogTitle("Select Project Location");
             chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             String path = this.projectLocationTextField.getText();
@@ -218,6 +218,7 @@ public class JME3TestsAndroidPanelVisual extends JPanel implements DocumentListe
     }
 
     // Implementation of DocumentListener --------------------------------------
+    @Override
     public void changedUpdate(DocumentEvent e) {
         updateTexts(e);
         if (this.projectNameTextField.getDocument() == e.getDocument()) {
@@ -225,6 +226,7 @@ public class JME3TestsAndroidPanelVisual extends JPanel implements DocumentListe
         }
     }
 
+    @Override
     public void insertUpdate(DocumentEvent e) {
         updateTexts(e);
         if (this.projectNameTextField.getDocument() == e.getDocument()) {
@@ -232,6 +234,7 @@ public class JME3TestsAndroidPanelVisual extends JPanel implements DocumentListe
         }
     }
 
+    @Override
     public void removeUpdate(DocumentEvent e) {
         updateTexts(e);
         if (this.projectNameTextField.getDocument() == e.getDocument()) {

+ 5 - 2
jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsPanelVisual.java

@@ -18,7 +18,7 @@ import org.openide.filesystems.FileUtil;
 public class JmeTestsPanelVisual extends JPanel implements DocumentListener {
 
     public static final String PROP_PROJECT_NAME = "projectName";
-    private JmeTestsWizardPanel panel;
+    private final JmeTestsWizardPanel panel;
 
     public JmeTestsPanelVisual(JmeTestsWizardPanel panel) {
         initComponents();
@@ -110,7 +110,7 @@ public class JmeTestsPanelVisual extends JPanel implements DocumentListener {
         String command = evt.getActionCommand();
         if ("BROWSE".equals(command)) {
             JFileChooser chooser = new JFileChooser();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
+            chooser.setCurrentDirectory(null);
             chooser.setDialogTitle("Select Project Location");
             chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             String path = this.projectLocationTextField.getText();
@@ -218,6 +218,7 @@ public class JmeTestsPanelVisual extends JPanel implements DocumentListener {
     }
 
     // Implementation of DocumentListener --------------------------------------
+    @Override
     public void changedUpdate(DocumentEvent e) {
         updateTexts(e);
         if (this.projectNameTextField.getDocument() == e.getDocument()) {
@@ -225,6 +226,7 @@ public class JmeTestsPanelVisual extends JPanel implements DocumentListener {
         }
     }
 
+    @Override
     public void insertUpdate(DocumentEvent e) {
         updateTexts(e);
         if (this.projectNameTextField.getDocument() == e.getDocument()) {
@@ -232,6 +234,7 @@ public class JmeTestsPanelVisual extends JPanel implements DocumentListener {
         }
     }
 
+    @Override
     public void removeUpdate(DocumentEvent e) {
         updateTexts(e);
         if (this.projectNameTextField.getDocument() == e.getDocument()) {