You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by mg...@apache.org on 2017/01/05 22:09:33 UTC
[25/50] cayenne-modeler git commit: Minor updates to focus on
TreeView instead of Search TextField upon startup.
Minor updates to focus on TreeView instead of Search TextField upon startup.
Project: http://git-wip-us.apache.org/repos/asf/cayenne-modeler/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne-modeler/commit/be0eaced
Tree: http://git-wip-us.apache.org/repos/asf/cayenne-modeler/tree/be0eaced
Diff: http://git-wip-us.apache.org/repos/asf/cayenne-modeler/diff/be0eaced
Branch: refs/heads/master
Commit: be0eaced60c6e2c772fcd99650a6a2d0a909c588
Parents: 04b54a7
Author: mrg <bl...@gmail.com>
Authored: Mon Oct 3 07:06:47 2016 -0400
Committer: mrg <bl...@gmail.com>
Committed: Mon Oct 3 07:06:47 2016 -0400
----------------------------------------------------------------------
.../apache/cayenne/modeler/CayenneModeler.java | 5 ++-
.../modeler/layout/MainWindowLayout.java | 33 ++++++--------------
2 files changed, 11 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/be0eaced/src/main/java/org/apache/cayenne/modeler/CayenneModeler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/cayenne/modeler/CayenneModeler.java b/src/main/java/org/apache/cayenne/modeler/CayenneModeler.java
index 9805b65..2c25f26 100644
--- a/src/main/java/org/apache/cayenne/modeler/CayenneModeler.java
+++ b/src/main/java/org/apache/cayenne/modeler/CayenneModeler.java
@@ -87,15 +87,14 @@ public class CayenneModeler extends Application
// TODO: Probably need to save this value off somewhere...
final MainWindowLayout mainWindow = new MainWindowLayout();
- mainWindow.displayCayenneProject(cayenneProject);
mainWindow.show();
+ mainWindow.displayCayenneProject(cayenneProject);
// For testing data sync across windows, this creates a second editor window:
final MainWindowLayout mainWindow2 = new MainWindowLayout();
- mainWindow2.displayCayenneProject(cayenneProject);
mainWindow2.show();
-
+ mainWindow2.displayCayenneProject(cayenneProject);
}
private static PreferencesLayout preferencesLayout;
http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/be0eaced/src/main/java/org/apache/cayenne/modeler/layout/MainWindowLayout.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/cayenne/modeler/layout/MainWindowLayout.java b/src/main/java/org/apache/cayenne/modeler/layout/MainWindowLayout.java
index 6670712..be4f5bd 100644
--- a/src/main/java/org/apache/cayenne/modeler/layout/MainWindowLayout.java
+++ b/src/main/java/org/apache/cayenne/modeler/layout/MainWindowLayout.java
@@ -75,6 +75,12 @@ public class MainWindowLayout
setMinimumWindowSize(900, 700);
}
+ @Override
+ public void initializeLayout()
+ {
+ super.initializeLayout();
+ }
+
public CayenneProject getCayenneProject()
{
return cayenneProject;
@@ -171,20 +177,10 @@ public class MainWindowLayout
NotificationCenter.addProjectListener(cayenneProject, this);
addDataDomain();
- }
-// public void initialize()
-// {
-//// configureMainToolbar();
-//
-// loadComponents();
-// }
-
-// private boolean toolbarNeedsInitialization = true;
-
-// private void configureMainToolbar()
-// {
-// }
+ treeView.getSelectionModel().select(0);
+ treeView.requestFocus();
+ }
private void addDataDomain()
{
@@ -312,22 +308,11 @@ public class MainWindowLayout
{
try
{
-// loader = new FXMLLoader();
-// TabPane loader.load();
-// FXMLLoader loader = new FXMLLoader();
-// loader.setLocation(MainWindow.class.getResource("/view/ObjectEntityView.fxml"));
-// TabPane objectEntityTabs = (TabPane) loader.load();
-
-// dataDomainDetail = FXMLLoader.load(MainWindow.class.getResource("/view/DataDomainView.fxml"));
dataDomainDetail = new DataDomainLayout(this);
dataMapDetail = new DataMapLayout(this);
objectEntityDetail = new ObjectEntityLayout(this);
databaseEntityDetail = new DatabaseEntityLayout(this);
dataNodeDetail = new DataNodeLayout(this);
-// objectEntityDetail = BaseView.loadFXML(getClass().getResource("/view/ObjectEntityView.fxml"), getStage());
-// objectEntityDetail = FXMLLoader.load(MainWindow.class.getResource("/view/ObjectEntityView.fxml"));
-
- // rootLayout.setCenter(personOverview);
mainToolBarLayout = new MainToolBarLayout(this);