changeset 5912:25b4801c0ad6

FINALS ONLY: Add final's back to code compiles under jdk7
author snorthov
date Thu, 05 Dec 2013 17:16:07 -0500
parents e3662305750a
children 5c12192a7720
files modules/controls/src/main/java/com/sun/javafx/scene/control/skin/MenuBarSkin.java modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java modules/graphics/src/main/java/javafx/scene/layout/GridPane.java modules/graphics/src/main/java/javafx/scene/layout/HBox.java modules/graphics/src/main/java/javafx/scene/layout/StackPane.java
diffstat 8 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/MenuBarSkin.java	Thu Dec 05 08:49:14 2013 -0800
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/MenuBarSkin.java	Thu Dec 05 17:16:07 2013 -0500
@@ -355,7 +355,7 @@
         ** add an accelerator for F10 on windows and ctrl+F10 on mac/linux
         ** pressing f10 will select the first menu button on a menubar
         */
-        KeyCombination acceleratorKeyCombo;
+        final KeyCombination acceleratorKeyCombo;
         final String os = System.getProperty("os.name");
         if (os != null && os.startsWith("Mac")) {
            acceleratorKeyCombo = KeyCombination.keyCombination("ctrl+F10");
--- a/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java	Thu Dec 05 08:49:14 2013 -0800
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java	Thu Dec 05 17:16:07 2013 -0500
@@ -180,7 +180,7 @@
         if (invokeLaterDispatcher != null) {
             invokeLaterDispatcher.invokeAndWait(runnable);
         } else {
-            CountDownLatch latch = new CountDownLatch(1);
+            final CountDownLatch latch = new CountDownLatch(1);
             submitForLaterInvocation(new Runnable() {
                 public void run() {
                     if (runnable != null) runnable.run();
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java	Thu Dec 05 08:49:14 2013 -0800
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java	Thu Dec 05 17:16:07 2013 -0500
@@ -271,9 +271,9 @@
     }
 
     @Override
-    public void inputMethodEvent(EventType<InputMethodEvent> type,
-                                 ObservableList<InputMethodTextRun> composed, String committed,
-                                 int caretPosition) {
+    public void inputMethodEvent(final EventType<InputMethodEvent> type,
+                                 final ObservableList<InputMethodTextRun> composed, final String committed,
+                                 final int caretPosition) {
         Platform.runLater(new Runnable() {
             @Override
             public void run() {
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java	Thu Dec 05 08:49:14 2013 -0800
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java	Thu Dec 05 17:16:07 2013 -0500
@@ -136,7 +136,7 @@
 
     @Override
     public int getPositionX() {
-        AtomicInteger x = new AtomicInteger(0);
+        final AtomicInteger x = new AtomicInteger(0);
         Application.invokeAndWait(new Runnable() {
             @Override
             public void run() {
@@ -148,7 +148,7 @@
 
     @Override
     public int getPositionY() {
-        AtomicInteger y = new AtomicInteger(0);
+        final AtomicInteger y = new AtomicInteger(0);
         Application.invokeAndWait(new Runnable() {
             @Override
             public void run() {
@@ -180,7 +180,7 @@
     
     @Override
     public int getRemoteLayerId() {
-        AtomicInteger id = new AtomicInteger(-1);
+        final AtomicInteger id = new AtomicInteger(-1);
         Application.invokeAndWait(new Runnable() {
             @Override
             public void run() {
--- a/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java	Thu Dec 05 08:49:14 2013 -0800
+++ b/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java	Thu Dec 05 17:16:07 2013 -0500
@@ -698,7 +698,7 @@
         return runs;
     }
 
-    private void normalizeRun(Run run, double runOffset) {
+    private void normalizeRun(final Run run, double runOffset) {
         if (getOrientation() == HORIZONTAL) {
             // horizontal
             ArrayList<Node> rownodes = new ArrayList();
@@ -713,7 +713,7 @@
             run.baselineOffset = getRowValignment() == VPos.BASELINE?
                     getAreaBaselineOffset(rownodes, marginAccessor, new Function<Integer, Double>() {
 
-                public Double apply(Integer i) {
+                public Double apply(final Integer i) {
                     return run.rects.get(i).width;
                 }
             }, run.height, true) : 0;
--- a/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java	Thu Dec 05 08:49:14 2013 -0800
+++ b/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java	Thu Dec 05 17:16:07 2013 -0500
@@ -1664,7 +1664,7 @@
 
         Orientation contentBias = getContentBias();
         CompositeSize heights;
-        CompositeSize widths;
+        final CompositeSize widths;
         if (contentBias == null) {
             heights = (CompositeSize) computePrefHeights(null).clone();
             widths = (CompositeSize) computePrefWidths(null).clone();
@@ -1689,8 +1689,8 @@
         double[] baselineOffsets = createDoubleArray(numRows, -1);
 
         for (int i = 0, size = managed.size(); i < size; i++) {
-            Node child = managed.get(i);
-            int rowIndex = getNodeRowIndex(child);
+            final Node child = managed.get(i);
+            final int rowIndex = getNodeRowIndex(child);
             int columnIndex = getNodeColumnIndex(child);
             int colspan = getNodeColumnSpan(child);
             if (colspan == REMAINING) {
--- a/modules/graphics/src/main/java/javafx/scene/layout/HBox.java	Thu Dec 05 08:49:14 2013 -0800
+++ b/modules/graphics/src/main/java/javafx/scene/layout/HBox.java	Thu Dec 05 17:16:07 2013 -0500
@@ -628,7 +628,7 @@
         double space = snapSpace(getSpacing());
         boolean shouldFillHeight = shouldFillHeight();
 
-        double[][] actualAreaWidths = getAreaWidths(managed, height, false);
+        final double[][] actualAreaWidths = getAreaWidths(managed, height, false);
         double contentWidth = adjustAreaWidths(managed, actualAreaWidths, width, height);
         double contentHeight = height - top - bottom;
 
--- a/modules/graphics/src/main/java/javafx/scene/layout/StackPane.java	Thu Dec 05 08:49:14 2013 -0800
+++ b/modules/graphics/src/main/java/javafx/scene/layout/StackPane.java	Thu Dec 05 17:16:07 2013 -0500
@@ -329,7 +329,7 @@
         Pos align = getAlignmentInternal();
         HPos alignHpos = align.getHpos();
         VPos alignVpos = align.getVpos();
-        double width = getWidth();
+        final double width = getWidth();
         double height = getHeight();
         double top = getInsets().getTop();
         double right = getInsets().getRight();