cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mgen...@apache.org
Subject [21/50] cayenne-modeler git commit: Method name change.
Date Thu, 05 Jan 2017 22:09:29 GMT
Method name change.


Project: http://git-wip-us.apache.org/repos/asf/cayenne-modeler/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne-modeler/commit/97c87741
Tree: http://git-wip-us.apache.org/repos/asf/cayenne-modeler/tree/97c87741
Diff: http://git-wip-us.apache.org/repos/asf/cayenne-modeler/diff/97c87741

Branch: refs/heads/master
Commit: 97c87741504ef7cc74765e5587ebc9e29f71b65a
Parents: 2602dcc
Author: mrg <blacknext@gmail.com>
Authored: Sat Oct 1 18:15:32 2016 -0400
Committer: mrg <blacknext@gmail.com>
Committed: Sat Oct 1 18:15:32 2016 -0400

----------------------------------------------------------------------
 .../cayenne/modeler/layout/AbstractViewLayout.java     | 13 ++++++-------
 .../modeler/layout/DataNodeConfigurationTabLayout.java |  2 +-
 .../apache/cayenne/modeler/layout/LayoutSupport.java   |  5 +++++
 3 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/97c87741/src/main/java/org/apache/cayenne/modeler/layout/AbstractViewLayout.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/cayenne/modeler/layout/AbstractViewLayout.java b/src/main/java/org/apache/cayenne/modeler/layout/AbstractViewLayout.java
index de2c4c7..75f5583 100644
--- a/src/main/java/org/apache/cayenne/modeler/layout/AbstractViewLayout.java
+++ b/src/main/java/org/apache/cayenne/modeler/layout/AbstractViewLayout.java
@@ -32,13 +32,12 @@ public abstract class AbstractViewLayout
 {
     private static final Log LOGGER = LogFactory.getLog(AbstractViewLayout.class);
 
-//    private MainWindowLayout  mainWindow;
-    private final MainWindowSupport parentComponent;
+    private final MainWindowSupport parentLayout;
 
-    protected AbstractViewLayout(final MainWindowSupport parentComponent, final String fxmlPath)
throws IOException
+    protected AbstractViewLayout(final MainWindowSupport parentLayout, final String fxmlPath)
throws IOException
     {
         // Note: This assignment must precede the FXML load.
-        this.parentComponent = parentComponent;
+        this.parentLayout = parentLayout;
 
         loadFXML(fxmlPath);
     }
@@ -52,11 +51,11 @@ public abstract class AbstractViewLayout
     @Override
     public MainWindowLayout getMainWindow()
     {
-        return parentComponent.getMainWindow(); //mainWindow;
+        return parentLayout.getMainWindow();
     }
 
-    public MainWindowSupport getParentComponent()
+    public MainWindowSupport getParentLayout()
     {
-        return parentComponent;
+        return parentLayout;
     }
 }

http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/97c87741/src/main/java/org/apache/cayenne/modeler/layout/DataNodeConfigurationTabLayout.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/cayenne/modeler/layout/DataNodeConfigurationTabLayout.java
b/src/main/java/org/apache/cayenne/modeler/layout/DataNodeConfigurationTabLayout.java
index c0d2d60..d05f7d9 100644
--- a/src/main/java/org/apache/cayenne/modeler/layout/DataNodeConfigurationTabLayout.java
+++ b/src/main/java/org/apache/cayenne/modeler/layout/DataNodeConfigurationTabLayout.java
@@ -136,7 +136,7 @@ public class DataNodeConfigurationTabLayout
                 dbcpConfigurationGrid.setVisible(dbcp);
                 dbcpConfigurationGrid.setManaged(dbcp);
 
-                final DataNodeLayout dataNodeLayout = (DataNodeLayout) getParentComponent();
+                final DataNodeLayout dataNodeLayout = (DataNodeLayout) getParentLayout();
 
                 if (jdbc)
                     dataNodeLayout.enablePasswordEncoderTab();

http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/97c87741/src/main/java/org/apache/cayenne/modeler/layout/LayoutSupport.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/cayenne/modeler/layout/LayoutSupport.java b/src/main/java/org/apache/cayenne/modeler/layout/LayoutSupport.java
index 4eec5c5..61b30c0 100644
--- a/src/main/java/org/apache/cayenne/modeler/layout/LayoutSupport.java
+++ b/src/main/java/org/apache/cayenne/modeler/layout/LayoutSupport.java
@@ -40,6 +40,11 @@ public interface LayoutSupport
         fxmlLoader.setController(this);
         fxmlLoader.load();
 
+        // Note: Must manually initialize the layout because JavaFX will not
+        //       automatically call the "initialize" method when the FXML is
+        //       loaded from an interface's default method.  To avoid confusion
+        //       with the JavaFX "initialize" name, a different method name is
+        //       used for the same purpose.
         initializeLayout();
 
         return fxmlLoader;


Mime
View raw message