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:19 UTC
[11/50] cayenne-modeler git commit: Updated DataDomainAdapter to
valid Property Adapter semantics.
Updated DataDomainAdapter to valid Property Adapter semantics.
Project: http://git-wip-us.apache.org/repos/asf/cayenne-modeler/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne-modeler/commit/885808f3
Tree: http://git-wip-us.apache.org/repos/asf/cayenne-modeler/tree/885808f3
Diff: http://git-wip-us.apache.org/repos/asf/cayenne-modeler/diff/885808f3
Branch: refs/heads/master
Commit: 885808f38174445253e060b5f4a95e54c4a6652a
Parents: 0e1ca18
Author: mrg <bl...@gmail.com>
Authored: Mon Sep 26 09:02:07 2016 -0400
Committer: mrg <bl...@gmail.com>
Committed: Mon Sep 26 09:02:07 2016 -0400
----------------------------------------------------------------------
.../modeler/adapters/DataDomainAdapter.java | 18 ++++++++----------
.../cayenne/modeler/layout/DataDomainLayout.java | 8 ++++----
.../modeler/project/DataDomainTreeItem.java | 2 +-
3 files changed, 13 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/885808f3/src/main/java/org/apache/cayenne/modeler/adapters/DataDomainAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/cayenne/modeler/adapters/DataDomainAdapter.java b/src/main/java/org/apache/cayenne/modeler/adapters/DataDomainAdapter.java
index f02a542..ef4914e 100644
--- a/src/main/java/org/apache/cayenne/modeler/adapters/DataDomainAdapter.java
+++ b/src/main/java/org/apache/cayenne/modeler/adapters/DataDomainAdapter.java
@@ -42,7 +42,7 @@ public class DataDomainAdapter extends CayennePropertyAdapter // implements Adap
private final List<DataMapAdapter> dataMapAdapters = new ArrayList<>(); //FXCollections.emptyObservableList();
private final List<DataNodeAdapter> dataNodeAdapters = new ArrayList<>(); //FXCollections.emptyObservableList();
- private StringProperty domainNameProperty;
+ private StringProperty nameProperty;
private BooleanProperty validatingObjectsProperty;
public DataDomainAdapter(final CayenneProject cayenneProject)
@@ -57,7 +57,7 @@ public class DataDomainAdapter extends CayennePropertyAdapter // implements Adap
try
{
- domainNameProperty = JavaBeanStringPropertyBuilder.create().bean(cayenneProject).name("dataDomainName").build();
+ nameProperty = JavaBeanStringPropertyBuilder.create().bean(cayenneProject).name("dataDomainName").build();
validatingObjectsProperty = JavaBeanBooleanPropertyBuilder.create().bean(cayenneProject).name("dataDomainValidatingObjects").build();
}
catch (final NoSuchMethodException e)
@@ -74,15 +74,13 @@ public class DataDomainAdapter extends CayennePropertyAdapter // implements Adap
// return dataDomainAdapter;
// }
- public StringProperty getDomainNameProperty()
- {
- return domainNameProperty;
- }
+ public StringProperty nameProperty() { return nameProperty; }
+ public String getName() { return nameProperty.get(); }
+ public void setName(final String value) { nameProperty.set(value); }
- public BooleanProperty getValidatingObjectsProperty()
- {
- return validatingObjectsProperty;
- }
+ public BooleanProperty validatingObjectsProperty() { return validatingObjectsProperty; }
+ public Boolean getValidatingObjectsProperty() { return validatingObjectsProperty.get(); }
+ public void setValidatingObjectsProperty(final Boolean value) { validatingObjectsProperty.set(value); }
public List<DataMapAdapter> getDataMapAdapters()
{
http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/885808f3/src/main/java/org/apache/cayenne/modeler/layout/DataDomainLayout.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/cayenne/modeler/layout/DataDomainLayout.java b/src/main/java/org/apache/cayenne/modeler/layout/DataDomainLayout.java
index e2ffdf0..9ebb186 100644
--- a/src/main/java/org/apache/cayenne/modeler/layout/DataDomainLayout.java
+++ b/src/main/java/org/apache/cayenne/modeler/layout/DataDomainLayout.java
@@ -80,8 +80,8 @@ public class DataDomainLayout
{
LOGGER.debug("begin editing " + this);
- dataDomainNameTextField.textProperty().bindBidirectional(dataDomainAdapter.getDomainNameProperty());
- objectValidationCheckBox.selectedProperty().bindBidirectional(dataDomainAdapter.getValidatingObjectsProperty());
+ dataDomainNameTextField.textProperty().bindBidirectional(dataDomainAdapter.nameProperty());
+ objectValidationCheckBox.selectedProperty().bindBidirectional(dataDomainAdapter.validatingObjectsProperty());
// accessibleHelpProperty()setText(getMainWindow().getCayenneProject().getDataDomainName());
// dataDomainNameTextField.textProperty().addListener((observable, oldValue, newValue) ->
}
@@ -135,8 +135,8 @@ public class DataDomainLayout
{
LOGGER.debug("end editing " + this);
- dataDomainNameTextField.textProperty().unbindBidirectional(dataDomainAdapter.getDomainNameProperty());
- objectValidationCheckBox.selectedProperty().unbindBidirectional(dataDomainAdapter.getValidatingObjectsProperty());
+ dataDomainNameTextField.textProperty().unbindBidirectional(dataDomainAdapter.nameProperty());
+ objectValidationCheckBox.selectedProperty().unbindBidirectional(dataDomainAdapter.validatingObjectsProperty());
// NotificationCenter.removeProjectListener(getMainWindow().getCayenneProject(), this);
//// BeanPathAdapter<CayenneModel> dataDomainAdapter = getDataDomainPropertyAdapterMap(getMainWindow().getCayenneModel());
http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/885808f3/src/main/java/org/apache/cayenne/modeler/project/DataDomainTreeItem.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/cayenne/modeler/project/DataDomainTreeItem.java b/src/main/java/org/apache/cayenne/modeler/project/DataDomainTreeItem.java
index dcc0d79..baa2f3f 100644
--- a/src/main/java/org/apache/cayenne/modeler/project/DataDomainTreeItem.java
+++ b/src/main/java/org/apache/cayenne/modeler/project/DataDomainTreeItem.java
@@ -36,7 +36,7 @@ public class DataDomainTreeItem extends TreeItem<String> implements CayenneTreeI
{
this.dataDomainAdapter = dataDomainAdapter;
- valueProperty().bindBidirectional(dataDomainAdapter.getDomainNameProperty());
+ valueProperty().bindBidirectional(dataDomainAdapter.nameProperty());
setGraphic(GlyphsDude.createIcon(FontAwesomeIcon.DATABASE, TREE_ICON_SIZE));
treeRoot.getChildren().add(this);
setExpanded(true);