changeset 7878:427fa460c27c

[SCENEBUILDER] Removed Warnings detected by Eclipse
author Jerome Cambon
date Wed, 27 Aug 2014 11:37:45 +0200
parents b941d80ae591
children 60236c9b4be4
files apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/job/wrap/WrapInSplitPaneJob.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/gridpane/GridPanePring.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/handles/AbstractCurveHandles.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/handles/AbstractNodeHandles.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/outline/NodeOutline.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/pring/NodePring.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/pring/TabPring.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/pring/TableColumnPring.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/pring/TreeTableColumnPring.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/tring/AbstractNodeTring.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/tring/TabTring.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/tring/TableColumnTring.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/tring/TreeTableColumnTring.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/mode/HitNodeChrome.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssValueConverter.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/InspectorPanelController.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/AnchorPaneConstraintsEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/ControllerClassEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/CursorEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/DividerPositionsEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/DoubleEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/EditorUtils.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/EventHandlerEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/FxIdEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/GenericEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/I18nStringEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/ImageEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/InlineListEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/InsetsEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/IntegerEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/Point3DEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/RotateEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StringEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StyleClassEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StyleEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StylesheetEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/TextAlignmentEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/ToggleGroupEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/BoundsPopupEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/EffectPopupEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/FontPopupEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/KeyCombinationPopupEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/PaintPopupEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/PopupEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/Rectangle2DPopupEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/StringPopupEditor.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMArchive.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/control/paintpicker/gradientpicker/GradientPicker.java
diffstat 48 files changed, 155 insertions(+), 139 deletions(-) [+]
line wrap: on
line diff
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/job/wrap/WrapInSplitPaneJob.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/job/wrap/WrapInSplitPaneJob.java	Wed Aug 27 11:37:45 2014 +0200
@@ -32,7 +32,6 @@
 package com.oracle.javafx.scenebuilder.kit.editor.job.wrap;
 
 import com.oracle.javafx.scenebuilder.kit.editor.EditorController;
-import com.oracle.javafx.scenebuilder.kit.editor.job.Job;
 import com.oracle.javafx.scenebuilder.kit.editor.job.JobUtils;
 import com.oracle.javafx.scenebuilder.kit.editor.job.wrap.FXOMObjectCourseComparator.BidimensionalComparator;
 import com.oracle.javafx.scenebuilder.kit.editor.job.wrap.FXOMObjectCourseComparator.GridCourse;
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/gridpane/GridPanePring.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/gridpane/GridPanePring.java	Wed Aug 27 11:37:45 2014 +0200
@@ -39,7 +39,6 @@
 import com.oracle.javafx.scenebuilder.kit.editor.selection.GridSelectionGroup;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.Node;
 import javafx.scene.layout.GridPane;
 import javafx.scene.paint.Color;
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/handles/AbstractCurveHandles.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/handles/AbstractCurveHandles.java	Wed Aug 27 11:37:45 2014 +0200
@@ -36,7 +36,6 @@
 
 import javafx.beans.value.ChangeListener;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.Node;
 import javafx.scene.transform.Transform;
 
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/handles/AbstractNodeHandles.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/handles/AbstractNodeHandles.java	Wed Aug 27 11:37:45 2014 +0200
@@ -34,7 +34,6 @@
 import com.oracle.javafx.scenebuilder.kit.editor.panel.content.ContentPanelController;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.Node;
 import javafx.scene.transform.Transform;
 
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/outline/NodeOutline.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/outline/NodeOutline.java	Wed Aug 27 11:37:45 2014 +0200
@@ -35,7 +35,6 @@
 import com.oracle.javafx.scenebuilder.kit.editor.panel.content.ContentPanelController;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.Node;
 import javafx.scene.transform.Transform;
 
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/pring/NodePring.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/pring/NodePring.java	Wed Aug 27 11:37:45 2014 +0200
@@ -36,7 +36,6 @@
 import com.oracle.javafx.scenebuilder.kit.editor.panel.content.gesture.SelectWithPringGesture;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.Node;
 import javafx.scene.transform.Transform;
 
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/pring/TabPring.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/pring/TabPring.java	Wed Aug 27 11:37:45 2014 +0200
@@ -38,7 +38,6 @@
 import com.oracle.javafx.scenebuilder.kit.editor.panel.content.gesture.SelectWithPringGesture;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.Node;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/pring/TableColumnPring.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/pring/TableColumnPring.java	Wed Aug 27 11:37:45 2014 +0200
@@ -37,7 +37,6 @@
 import com.oracle.javafx.scenebuilder.kit.editor.panel.content.gesture.SelectWithPringGesture;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.Node;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/pring/TreeTableColumnPring.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/pring/TreeTableColumnPring.java	Wed Aug 27 11:37:45 2014 +0200
@@ -37,7 +37,6 @@
 import com.oracle.javafx.scenebuilder.kit.editor.panel.content.gesture.SelectWithPringGesture;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.Node;
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTableView;
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/tring/AbstractNodeTring.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/tring/AbstractNodeTring.java	Wed Aug 27 11:37:45 2014 +0200
@@ -34,7 +34,6 @@
 import com.oracle.javafx.scenebuilder.kit.editor.panel.content.ContentPanelController;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.Node;
 import javafx.scene.transform.Transform;
 
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/tring/TabTring.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/tring/TabTring.java	Wed Aug 27 11:37:45 2014 +0200
@@ -35,7 +35,6 @@
 import com.oracle.javafx.scenebuilder.kit.editor.panel.content.driver.TabOutline;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.scene.paint.Paint;
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/tring/TableColumnTring.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/tring/TableColumnTring.java	Wed Aug 27 11:37:45 2014 +0200
@@ -35,7 +35,6 @@
 import com.oracle.javafx.scenebuilder.kit.editor.panel.content.driver.TableViewDesignInfoX;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.transform.Transform;
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/tring/TreeTableColumnTring.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/tring/TreeTableColumnTring.java	Wed Aug 27 11:37:45 2014 +0200
@@ -35,7 +35,6 @@
 import com.oracle.javafx.scenebuilder.kit.editor.panel.content.driver.TreeTableViewDesignInfoX;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTableView;
 import javafx.scene.transform.Transform;
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/mode/HitNodeChrome.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/mode/HitNodeChrome.java	Wed Aug 27 11:37:45 2014 +0200
@@ -37,7 +37,6 @@
 import com.oracle.javafx.scenebuilder.kit.editor.panel.content.util.RegionRectangle;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMObject;
 import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
 import javafx.scene.Node;
 import javafx.scene.transform.Transform;
 
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssValueConverter.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssValueConverter.java	Wed Aug 27 11:37:45 2014 +0200
@@ -925,7 +925,7 @@
         }
     }
 
-    @SuppressWarnings({"BroadCatchBlock", "TooBroadCatch"}) //NOI18N
+//    @SuppressWarnings({"BroadCatchBlock", "TooBroadCatch"}) //NOI18N
     private static Effect getEffectInput(Effect effect) {
         Effect found = null;
         try {
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/InspectorPanelController.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/InspectorPanelController.java	Wed Aug 27 11:37:45 2014 +0200
@@ -1915,20 +1915,18 @@
         @FXML
         private Label titleLb;
 
-        private final Parent root;
+        private Parent root;
 
-        @SuppressWarnings("LeakingThisInConstructor")
         public SubSectionTitle(String title) {
-//            System.out.println("Loading new SubSection.fxml...");
-            URL fxmlURL = SubSectionTitle.class.getResource("SubSection.fxml");
-            root = EditorUtils.loadFxml(fxmlURL, this);
-
             initialize(title);
         }
 
         // Separate method to avoid FindBugs warning
         private void initialize(String title) {
-            titleLb.setText(title);
+//          System.out.println("Loading new SubSection.fxml...");
+          URL fxmlURL = SubSectionTitle.class.getResource("SubSection.fxml");
+          root = EditorUtils.loadFxml(fxmlURL, this);
+          titleLb.setText(title);
         }
 
         public void setTitle(String title) {
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/AnchorPaneConstraintsEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/AnchorPaneConstraintsEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -80,34 +80,31 @@
     @FXML
     private TextField topTf;
 
-    private final Parent root;
+    private Parent root = null;
     private final ArrayList<ConstraintEditor> contraintEditors = new ArrayList<>();
-    private final ChangeListener<Object> constraintListener;
-    private Set<FXOMInstance> selectedInstances;
+    private ChangeListener<Object> constraintListener;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public AnchorPaneConstraintsEditor(String name, ValuePropertyMetadata topPropMeta,
             ValuePropertyMetadata rightPropMeta,
             ValuePropertyMetadata bottomPropMeta,
             ValuePropertyMetadata leftPropMeta,
             Set<FXOMInstance> selectedInstances) {
         super(name);
+        initialize(topPropMeta, rightPropMeta, bottomPropMeta, leftPropMeta, selectedInstances);
+        propertyChanged();
+        styleRegions();
+    }
+
+    // Method to please findBugs
+    private void initialize(ValuePropertyMetadata topPropMeta, ValuePropertyMetadata rightPropMeta,
+            ValuePropertyMetadata bottomPropMeta, ValuePropertyMetadata leftPropMeta, Set<FXOMInstance> selectedInstances) {
         root = EditorUtils.loadFxml("AnchorPaneConstraintsEditor.fxml", this);
-        this.selectedInstances = selectedInstances;
 
         constraintListener = (ov, prevValue, newValue) -> {
             propertyChanged();
             styleRegions();
         };
 
-        initialize(topPropMeta, rightPropMeta, bottomPropMeta, leftPropMeta);
-        propertyChanged();
-        styleRegions();
-    }
-
-    // Method to please findBugs
-    private void initialize(ValuePropertyMetadata topPropMeta, ValuePropertyMetadata rightPropMeta,
-            ValuePropertyMetadata bottomPropMeta, ValuePropertyMetadata leftPropMeta) {
         contraintEditors.add(
                 new ConstraintEditor(topTf, topTb, selectedInstances, topPropMeta, constraintListener));
         contraintEditors.add(
@@ -132,7 +129,6 @@
             ValuePropertyMetadata bottomPropMeta,
             ValuePropertyMetadata leftPropMeta,
             Set<FXOMInstance> selectedInstances) {
-        this.selectedInstances = selectedInstances;
         contraintEditors.get(0).reset(selectedInstances, topPropMeta);
         contraintEditors.get(1).reset(selectedInstances, rightPropMeta);
         contraintEditors.get(2).reset(selectedInstances, bottomPropMeta);
@@ -176,7 +172,6 @@
 
         private boolean updateFromTextField = false;
 
-        @SuppressWarnings("LeakingThisInConstructor")
         public ConstraintEditor(TextField textField, ToggleButton toggleButton, Set<FXOMInstance> selectedInstances,
                 ValuePropertyMetadata propMeta, ChangeListener<Object> listener) {
             super(propMeta, null);
@@ -185,7 +180,11 @@
             this.toggleButton = toggleButton;
             this.selectedInstances = selectedInstances;
             this.propMeta = propMeta;
-
+            
+            initialize();
+        }
+        
+        private void initialize() {
             //
             // Text field
             //
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/ControllerClassEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/ControllerClassEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -46,10 +46,12 @@
     private static final String PROPERTY_NAME = "Controller class"; //NOI18N
     private static final String DEFAULT_VALUE = null;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public ControllerClassEditor(List<String> suggestedClasses) {
         super(PROPERTY_NAME, DEFAULT_VALUE, suggestedClasses);
-
+        initialize();
+    }
+    
+    private void initialize() {
         // text field events handling
         EventHandler<ActionEvent> onActionListener = event -> {
             if (isHandlingError()) {
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/CursorEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/CursorEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -56,7 +56,7 @@
  */
 public class CursorEditor extends PropertyEditor {
 
-    private final Parent root;
+    private Parent root;
 
     @FXML
     private MenuButton cursorMb;
@@ -68,15 +68,14 @@
     private Cursor cursor = Cursor.DEFAULT;
     private String inheritedText, inheritedParentText;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public CursorEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
-        root = EditorUtils.loadFxml("CursorEditor.fxml", this); //NOI18N
         initialize();
     }
 
     // Separate method to please FindBugs
     private void initialize() {
+        root = EditorUtils.loadFxml("CursorEditor.fxml", this); //NOI18N
         int index = 0;
         Map<Cursor, String> predefinedCursors = CursorPropertyMetadata.getCursorMap();
         // Order the cursors
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/DividerPositionsEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/DividerPositionsEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -50,7 +50,6 @@
 
     private final VBox vbox = new VBox(5);
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public DividerPositionsEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
         setLayoutFormat(PropertyEditor.LayoutFormat.SIMPLE_LINE_TOP);
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/DoubleEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/DoubleEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -51,9 +51,12 @@
 
     private Map<String, Object> constants;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public DoubleEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses, Map<String, Object> constants) {
         super(propMeta, selectedClasses, new ArrayList<>(constants.keySet()), AutoSuggestEditor.Type.DOUBLE);
+        initialize(constants);
+    }
+    
+    private void initialize(Map<String, Object> constants) {
         this.constants = constants;
 
         EventHandler<ActionEvent> onActionListener = event -> {
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/EditorUtils.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/EditorUtils.java	Wed Aug 27 11:37:45 2014 +0200
@@ -514,7 +514,7 @@
     }
     
     // Get the URL corresponding to a PrefixedValue string
-    @SuppressWarnings("UseSpecificCatch")
+//    @SuppressWarnings("UseSpecificCatch")
     public static URL getUrl(String prefixedString, URL fxmlFileLocation) {
         PrefixedValue prefixedValue = new PrefixedValue(prefixedString);
         URL url = null;
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/EventHandlerEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/EventHandlerEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -63,9 +63,12 @@
     private HBox hbox = null;
     private List<String> suggestedMethods;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public EventHandlerEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses, List<String> suggestedMethods) {
         super(propMeta, selectedClasses, suggestedMethods); //NOI18N
+        initialize(suggestedMethods);
+    }
+
+    private void initialize(List<String> suggestedMethods) {
         this.suggestedMethods = suggestedMethods;
 
         // text field events handling
@@ -106,7 +109,7 @@
         // methodeName mode by default
         switchToMethodNameMode();
     }
-
+    
     @Override
     public Object getValue() {
         String valueTf = getTextField().getText();
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/FxIdEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/FxIdEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -50,9 +50,12 @@
     private static final String DEFAULT_VALUE = null;
     private EditorController editorController;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public FxIdEditor(List<String> suggestedFxIds, EditorController editorController) {
         super(PROPERTY_NAME, DEFAULT_VALUE, suggestedFxIds); //NOI18N
+        initialize(editorController);
+    }
+    
+    private void initialize(EditorController editorController) {
         this.editorController = editorController;
 
         // text field events handling
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/GenericEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/GenericEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -45,11 +45,14 @@
  */
 public class GenericEditor extends PropertyEditor {
 
-    private final TextField textField;
+    private TextField textField;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public GenericEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
+        initialize();
+    }
+    
+    private void initialize() {
         textField = new TextField();
         EventHandler<ActionEvent> onActionListener = event -> userUpdateValueProperty(getValue());
         setTextEditorBehavior(this, textField, onActionListener);
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/I18nStringEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/I18nStringEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -57,7 +57,7 @@
     private static final String PERCENT_STR = "%"; //NOI18N
     private TextInputControl textNode = new TextField();
     private HBox i18nHBox = null;
-    final EventHandler<ActionEvent> valueListener;
+    private EventHandler<ActionEvent> valueListener;
     private final MenuItem i18nMenuItem = new MenuItem();
     private final String I18N_ON = I18N.getString("inspector.i18n.on");
     private final String I18N_OFF = I18N.getString("inspector.i18n.off");
@@ -68,10 +68,12 @@
     private boolean i18nMode = false;
     private boolean multiLineMode = false;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public I18nStringEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
-
+        initialize();
+    }
+    
+    private void initialize() {
         valueListener = event -> {
             userUpdateValueProperty(getValue());
             textNode.selectAll();
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/ImageEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/ImageEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -65,7 +65,7 @@
     @FXML
     private TextField imagePathTf;
 
-    private final Parent root;
+    private Parent root;
     private DesignImage image = null;
 
     private final MenuItem documentRelativeMenuItem
@@ -78,9 +78,13 @@
     private PrefixedValue.Type type = PrefixedValue.Type.PLAIN_STRING;
     private URL fxmlFileLocation;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public ImageEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses, URL fxmlFileLocation) {
         super(propMeta, selectedClasses);
+        initialize(fxmlFileLocation);
+    }
+    
+    // Separate method to please FindBugs
+    private void initialize(URL fxmlFileLocation) {
         this.fxmlFileLocation = fxmlFileLocation;
         root = EditorUtils.loadFxml("ImageEditor.fxml", this); //NOI18N
 
@@ -107,11 +111,6 @@
             image = new DesignImage(imageObj, prefixedValue);
             userUpdateValueProperty(image);
         };
-        initialize(valueListener);
-    }
-
-    // Separate method to please FindBugs
-    private void initialize(EventHandler<ActionEvent> valueListener) {
         setTextEditorBehavior(this, imagePathTf, valueListener);
 
         documentRelativeMenuItem.setOnAction(e -> switchType(PrefixedValue.Type.DOCUMENT_RELATIVE_PATH));
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/InlineListEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/InlineListEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -49,7 +49,6 @@
     private final VBox vbox = new VBox(1);
     private final List<EditorItem> editorItems = new ArrayList<>();
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public InlineListEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
         setLayoutFormat(PropertyEditor.LayoutFormat.DOUBLE_LINE);
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/InsetsEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/InsetsEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -51,7 +51,7 @@
  */
 public class InsetsEditor extends PropertyEditor {
 
-    private final Parent root;
+    private Parent root;
     @FXML
     private Button linkBt;
     @FXML
@@ -65,17 +65,14 @@
     TextField[] textFields = new TextField[4];
     TextField errorTf;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public InsetsEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
-        root = EditorUtils.loadFxml("InsetsEditor.fxml", this);
-
         initialize();
-        setLayoutFormat(LayoutFormat.SIMPLE_LINE_BOTTOM);
     }
 
     //Method to please FindBugs
     private void initialize() {
+        root = EditorUtils.loadFxml("InsetsEditor.fxml", this);
         textFields[0] = topTf;
         textFields[1] = rightTf;
         textFields[2] = bottomTf;
@@ -92,6 +89,7 @@
             setNumericEditorBehavior(this, tf, valueListener, false);
         }
         linkBt.disableProperty().bind(disableProperty());
+        setLayoutFormat(LayoutFormat.SIMPLE_LINE_BOTTOM);
     }
 
     @Override
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/IntegerEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/IntegerEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -53,10 +53,13 @@
     private int min;
     private int max;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public IntegerEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses,
             Map<String, Object> constants, int minVal, int maxVal) {
         super(propMeta, selectedClasses, new ArrayList<>(constants.keySet()), AutoSuggestEditor.Type.INTEGER);
+        initialize(constants, minVal, maxVal);
+    }
+    
+    private void initialize(Map<String, Object> constants, int minVal, int maxVal) {
         this.constants = constants;
         this.min = minVal;
         this.max = maxVal;
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/Point3DEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/Point3DEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -47,7 +47,7 @@
  */
 public class Point3DEditor extends PropertyEditor {
 
-    private final Parent root;
+    private Parent root;
     @FXML
     private DoubleField xDf;
     @FXML
@@ -56,17 +56,15 @@
     private DoubleField zDf;
     DoubleField[] doubleFields = new DoubleField[3];
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public Point3DEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
-        root = EditorUtils.loadFxml("Point3DEditor.fxml", this);//NOI18N
-
         initialize();
-        setLayoutFormat(PropertyEditor.LayoutFormat.SIMPLE_LINE_BOTTOM);
     }
 
     //Method to please FindBugs
     private void initialize() {
+        root = EditorUtils.loadFxml("Point3DEditor.fxml", this);//NOI18N
+
         doubleFields[0] = xDf;
         doubleFields[1] = yDf;
         doubleFields[2] = zDf;
@@ -74,6 +72,7 @@
             EventHandler<ActionEvent> valueListener = event -> userUpdateValueProperty(getValue());
             setNumericEditorBehavior(this, doubleField, valueListener, false);
         }
+        setLayoutFormat(PropertyEditor.LayoutFormat.SIMPLE_LINE_BOTTOM);
     }
 
     @Override
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/RotateEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/RotateEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -61,13 +61,17 @@
     @FXML
     private Button rotatorHandle;
 
-    private final Parent root;
+    private Parent root;
     private int roundingFactor = 10; // 1 decimal
     private boolean updateFromRotator = false;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public RotateEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
+        initialize();
+    }
+    
+    // Method to please FindBugs
+    private void initialize() {
         root = EditorUtils.loadFxml("RotateEditor.fxml", this);
 
         //
@@ -95,11 +99,6 @@
             userUpdateValueProperty(valDouble);
 
         };
-        initialize(valueListener);
-    }
-    
-    // Method to please FindBugs
-    private void initialize(EventHandler<ActionEvent> valueListener) {
         setNumericEditorBehavior(this, rotateTf, valueListener, false);
     }
 
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StringEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StringEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -47,12 +47,14 @@
 public class StringEditor extends PropertyEditor {
 
     private TextInputControl textField = new TextField();
-    final EventHandler<ActionEvent> valueListener;
+    private EventHandler<ActionEvent> valueListener;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public StringEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
+        initialize();
+    }
 
+    private void initialize() {
         valueListener = event -> {
             userUpdateValueProperty(getValue());
             textField.selectAll();
@@ -62,7 +64,7 @@
         // Double line editor by default
         setLayoutFormat(LayoutFormat.DOUBLE_LINE);
     }
-
+    
     @Override
     public Object getValue() {
         return EditorUtils.getPlainString(textField.getText());
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StyleClassEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StyleClassEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -78,10 +78,13 @@
     private List<String> themeClasses;
     private EditorController editorController;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public StyleClassEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses,
             Set<FXOMInstance> selectedInstances, EditorController editorController) {
         super(propMeta, selectedClasses);
+        initialize(selectedInstances, editorController);
+    }
+    
+    private void initialize(Set<FXOMInstance> selectedInstances, EditorController editorController) {
         this.selectedInstances = selectedInstances;
         this.editorController = editorController;
         setLayoutFormat(PropertyEditor.LayoutFormat.DOUBLE_LINE);
@@ -214,26 +217,25 @@
         @FXML
         private StackPane styleClassSp;
 
-        private final Parent root;
+        private Parent root;
         private TextField styleClassTf;
         private String currentValue;
-        private final Map<String, String> cssClassesMap;
-        private final EditorItemDelegate editor;
+        private Map<String, String> cssClassesMap;
+        private EditorItemDelegate editor;
 
-        @SuppressWarnings("LeakingThisInConstructor")
         public StyleClassItem(EditorItemDelegate editor, Map<String, String> cssClassesMap) {
 //            System.out.println("New StyleClassItem.");
             // It is an AutoSuggestEditor without MenuButton
             super("", "", new ArrayList<>(cssClassesMap.keySet()), false); //NOI18N
+            initialize(editor, cssClassesMap);
+        }
+
+        // Method to please FindBugs
+        private void initialize(EditorItemDelegate editor, Map<String, String> cssClassesMap) {
             this.editor = editor;
             this.cssClassesMap = cssClassesMap;
             root = EditorUtils.loadFxml("StyleClassEditorItem.fxml", this);//NOI18N
 
-            initialize();
-        }
-
-        // Method to please FindBugs
-        private void initialize() {
             // Add the AutoSuggest text field in the scene graph
             styleClassSp.getChildren().add(super.getRoot());
 
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StyleEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StyleEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -77,9 +77,12 @@
     private Set<Class<?>> selectedClasses;
     private EditorController editorController;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public StyleEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses, EditorController editorController) {
         super(propMeta, selectedClasses);
+        initialize(selectedClasses, editorController);
+    }
+    
+    private void initialize(Set<Class<?>> selectedClasses, EditorController editorController) {
         this.selectedClasses = selectedClasses;
         this.editorController = editorController;
         setLayoutFormat(LayoutFormat.DOUBLE_LINE);
@@ -227,26 +230,25 @@
         @FXML
         private StackPane propertySp;
 
-        private final Parent root;
+        private Parent root;
         private TextField propertyTf;
         private String currentValue;
-        private final EditorItemDelegate editor;
+        private EditorItemDelegate editor;
         private boolean parsingError = false;
         private ListChangeListener<CssError> errorListener;
 
-        @SuppressWarnings("LeakingThisInConstructor")
         public StyleItem(EditorItemDelegate editor, List<String> suggestedList) {
 //            System.out.println("New StyleItem.");
             // It is an AutoSuggestEditor without MenuButton
             super("", "", suggestedList, false);
+            initialize(editor);
+        }
+
+        // Method to please FindBugs
+        private void initialize(EditorItemDelegate editor) {
             this.editor = editor;
             root = EditorUtils.loadFxml("StyleEditorItem.fxml", this);
 
-            initialize();
-        }
-
-        // Method to please FindBugs
-        private void initialize() {
             // Add the AutoSuggest text field in the scene graph
             propertySp.getChildren().add(super.getRoot());
 
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StylesheetEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StylesheetEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -78,7 +78,7 @@
 public class StylesheetEditor extends InlineListEditor {
 
     private final StackPane root = new StackPane();
-    private final Parent rootInitialBt;
+    private Parent rootInitialBt;
 
     private final MenuItem documentRelativeMenuItem
             = new MenuItem(I18N.getString("inspector.resource.documentrelative"));
@@ -90,9 +90,12 @@
     private Type type;
     private URL fxmlFileLocation;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public StylesheetEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses, URL fxmlFileLocation) {
         super(propMeta, selectedClasses);
+        initialize(fxmlFileLocation);
+    }
+    
+    private void initialize(URL fxmlFileLocation) {
         this.fxmlFileLocation = fxmlFileLocation;
         setLayoutFormat(PropertyEditor.LayoutFormat.DOUBLE_LINE);
         // Add initial button
@@ -404,24 +407,23 @@
         @FXML
         private TextField stylesheetTf;
 
-        private final Pane root;
+        private Pane root;
         private String currentValue;
-        private final EditorItemDelegate editor;
+        private EditorItemDelegate editor;
         private Type itemType = Type.PLAIN_STRING;
 
-        @SuppressWarnings("LeakingThisInConstructor")
         public StylesheetItem(EditorItemDelegate editor, String url) {
 //            System.out.println("New StylesheetItem.");
+            initialize(editor, url);
+        }
+
+        // Method to please FindBugs
+        private void initialize(EditorItemDelegate editor, String url) {
             this.editor = editor;
             Parent parentRoot = EditorUtils.loadFxml("StylesheetEditorItem.fxml", this);
             assert parentRoot instanceof Pane;
             root = (Pane) parentRoot;
 
-            initialize(url);
-        }
-
-        // Method to please FindBugs
-        private void initialize(String url) {
             setValue(url);
             EventHandler<ActionEvent> onActionListener = event -> {
 //                    System.out.println("StylesheetItem : onActionListener");
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/TextAlignmentEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/TextAlignmentEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -48,7 +48,7 @@
  */
 public class TextAlignmentEditor extends PropertyEditor {
 
-    private final Parent root;
+    private Parent root;
     @FXML
     private ToggleButton leftTb;
     @FXML
@@ -60,17 +60,15 @@
 
     private final ToggleButton[] toggleButtons = new ToggleButton[4];
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public TextAlignmentEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
-        root = EditorUtils.loadFxml("TextAlignmentEditor.fxml", this); //NOI18N
-
         initialize();
-        setLayoutFormat(LayoutFormat.SIMPLE_LINE_BOTTOM);
     }
 
     //Method to please FindBugs
     private void initialize() {
+        root = EditorUtils.loadFxml("TextAlignmentEditor.fxml", this); //NOI18N
+
         toggleButtons[0] = leftTb;
         toggleButtons[1] = centerTb;
         toggleButtons[2] = rightTb;
@@ -79,6 +77,7 @@
             tb.setOnAction(t -> userUpdateValueProperty(getValue()));
             tb.disableProperty().bind(disableProperty());
         }
+        setLayoutFormat(LayoutFormat.SIMPLE_LINE_BOTTOM);
     }
 
     @Override
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/ToggleGroupEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/ToggleGroupEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -47,9 +47,12 @@
 
     List<String> suggestedTgs;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public ToggleGroupEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses, List<String> suggestedTgs) {
         super(propMeta, selectedClasses, suggestedTgs);
+        initialize(suggestedTgs);
+    }
+    
+    private void initialize(List<String> suggestedTgs) {
         this.suggestedTgs = suggestedTgs;
 
         // text field events handling
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/BoundsPopupEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/BoundsPopupEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -67,7 +67,6 @@
     private Parent root;
     private Bounds bounds;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public BoundsPopupEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
     }
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/EffectPopupEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/EffectPopupEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -52,7 +52,7 @@
 
     private EffectPicker effectPicker;
     private List<MenuItem> effectMenuItems;
-    private final EditorController editorController;
+    private EditorController editorController;
 
     private final ChangeListener<Number> effectRevisionChangeListener = (ov, t, t1) -> {
         final Effect rootEffect = effectPicker.getRootEffectProperty();
@@ -79,9 +79,12 @@
         }
     };
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public EffectPopupEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses, EditorController editorController) {
         super(propMeta, selectedClasses);
+        initialize(editorController);
+    }
+    
+    private void initialize(EditorController editorController) {
         this.editorController = editorController;
     }
 
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/FontPopupEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/FontPopupEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -79,12 +79,15 @@
     private BoundedDoubleEditor sizeEditor;
     private EditorController editorController;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public FontPopupEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses, EditorController editorController) {
         super(propMeta, selectedClasses);
+        initialize(editorController);
+    }
+
+    private void initialize(EditorController editorController) {
         this.editorController = editorController;
     }
-
+    
     private void setStyle() {
         styleEditor.reset("", "", new ArrayList<>(getStyles(familyEditor.getValue(), false, editorController)));//NOI18N
         styleEditor.setUpdateFromModel(true);
@@ -206,9 +209,12 @@
         private List<String> families;
         private String family = null;
 
-        @SuppressWarnings("LeakingThisInConstructor")
         public FamilyEditor(String name, String defaultValue, List<String> families, EditorController editorController) {
             super(name, defaultValue, families);
+            initialize(families, editorController);
+        }
+        
+        private void initialize(List<String> families, EditorController editorController) {
             this.families = families;
             EventHandler<ActionEvent> onActionListener = event -> {
                 if (Objects.equals(family, getTextField().getText())) {
@@ -244,9 +250,12 @@
         
         private String style = null;
 
-        @SuppressWarnings("LeakingThisInConstructor")
         public StyleEditor(String name, String defaultValue, List<String> suggestedList, EditorController editorController) {
             super(name, defaultValue, suggestedList);
+            initialize(editorController);
+        }
+        
+        private void initialize(EditorController editorController) {
             EventHandler<ActionEvent> onActionListener = event -> {
                 if (Objects.equals(style, getTextField().getText())) {
                     // no change
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/KeyCombinationPopupEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/KeyCombinationPopupEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -93,10 +93,13 @@
         KeyCombination.SHIFT_ANY, KeyCombination.SHIFT_DOWN,
         KeyCombination.SHORTCUT_ANY, KeyCombination.SHORTCUT_DOWN};
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public KeyCombinationPopupEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses,
             EditorController editorController) {
         super(propMeta, selectedClasses);
+        initialize(editorController);
+    }
+    
+    private void initialize(EditorController editorController) {
         this.editorController = editorController;
     }
 
@@ -406,14 +409,17 @@
         return row;
     }
 
-    @SuppressWarnings("LeakingThisInConstructor")
     private class MainKey extends AutoSuggestEditor {
 
-        private final EditorController editorController;
+        private EditorController editorController;
         String mainKey = null;
 
         public MainKey(List<String> suggestedKeys, EditorController editorController) {
             super("", null, suggestedKeys); //NOI18N
+            initialize(editorController);
+        }
+        
+        private void initialize(EditorController editorController) {
             this.editorController = editorController;
             EventHandler<ActionEvent> onActionListener = t -> {
                 if (Objects.equals(mainKey, getTextField().getText())) {
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/PaintPopupEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/PaintPopupEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -54,7 +54,7 @@
 
     private PaintPicker paintPicker;
     private final Rectangle graphic = new Rectangle(20, 10);
-    private final EditorController editorController;
+    private EditorController editorController;
 
     private final ChangeListener<Paint> paintChangeListener = (ov, oldValue, newValue) -> {
         // If live update, do not commit the value
@@ -73,9 +73,12 @@
         }
     };
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public PaintPopupEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses, EditorController editorController) {
         super(propMeta, selectedClasses);
+        initialize(editorController);
+    }
+    
+    private void initialize(EditorController editorController) {
         this.editorController = editorController;
     }
 
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/PopupEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/PopupEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -62,17 +62,14 @@
     private Object value;
     private boolean initialized = false;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public PopupEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
-
-        EditorUtils.loadPopupFxml("PopupEditor.fxml", this);
-        
         initializeEditor();
     }
     
     // Separate method to please FindBugs
     private void initializeEditor() {
+        EditorUtils.loadPopupFxml("PopupEditor.fxml", this);
         // Lazy initialization of the editor,
         // the first time the popup is opened.
         popupMb.showingProperty().addListener((ChangeListener<Boolean>) (ov, previousVal, newVal) -> {
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/Rectangle2DPopupEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/Rectangle2DPopupEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -61,7 +61,6 @@
     private Parent root;
     private Rectangle2D rectangle2D;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public Rectangle2DPopupEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
     }
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/StringPopupEditor.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/popupeditors/StringPopupEditor.java	Wed Aug 27 11:37:45 2014 +0200
@@ -51,7 +51,6 @@
 
     private Parent root;
 
-    @SuppressWarnings("LeakingThisInConstructor")
     public StringPopupEditor(ValuePropertyMetadata propMeta, Set<Class<?>> selectedClasses) {
         super(propMeta, selectedClasses);
     }
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMArchive.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMArchive.java	Wed Aug 27 11:37:45 2014 +0200
@@ -36,7 +36,6 @@
 import java.io.Serializable;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/control/paintpicker/gradientpicker/GradientPicker.java	Wed Aug 27 10:12:55 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/control/paintpicker/gradientpicker/GradientPicker.java	Wed Aug 27 11:37:45 2014 +0200
@@ -57,8 +57,6 @@
 import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
 import javafx.event.Event;
-import javafx.event.EventHandler;
-import javafx.event.EventType;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;