cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mgen...@apache.org
Subject [16/50] cayenne-modeler git commit: Removed JFXtras Labs dependency.
Date Thu, 05 Jan 2017 22:09:24 GMT
Removed JFXtras Labs dependency.


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

Branch: refs/heads/master
Commit: 25eb1bc91944bbcc1947fc729211c6a9667f2e34
Parents: cdf0f9e
Author: mrg <blacknext@gmail.com>
Authored: Thu Sep 29 09:04:04 2016 -0400
Committer: mrg <blacknext@gmail.com>
Committed: Thu Sep 29 09:04:04 2016 -0400

----------------------------------------------------------------------
 README.md                                           |  2 --
 pom.xml                                             | 10 +++-------
 .../cayenne/modeler/layout/AbstractViewLayout.java  | 11 +++++++++++
 .../cayenne/modeler/layout/DataDomainLayout.java    | 16 +++++-----------
 .../layout/ObjectEntityAttributesTabLayout.java     |  7 ++++---
 5 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/25eb1bc9/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index af72627..0906b74 100644
--- a/README.md
+++ b/README.md
@@ -77,8 +77,6 @@ There are so many things needing to be done.  See the [issues](https://github.co
 
 The [FontAwesomeFX](https://bitbucket.org/Jerady/fontawesomefx) library is used to provide
icons from [FontAwesome](https://fortawesome.github.io/Font-Awesome/).
 
-The [JFXtras Labs](http://jfxtras.org/) library is used for data synchronization.
-
 ## License
 
 [Apache Software Foundation](http://www.apache.org/licenses/LICENSE-2.0)

http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/25eb1bc9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 97d87ce..3431017 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific 
 	language governing permissions and limitations under the License. -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.apache.cayenne</groupId>
 	<artifactId>modeler</artifactId>
@@ -78,10 +79,5 @@
 			<artifactId>fontawesomefx</artifactId>
 			<version>${fontawesomefx.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.jfxtras</groupId>
-			<artifactId>jfxtras-labs</artifactId>
-			<version>${jfxtras.version}</version>
-		</dependency>
 	</dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/25eb1bc9/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 3fee9bf..6a03c01 100644
--- a/src/main/java/org/apache/cayenne/modeler/layout/AbstractViewLayout.java
+++ b/src/main/java/org/apache/cayenne/modeler/layout/AbstractViewLayout.java
@@ -25,6 +25,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
 import javafx.scene.layout.AnchorPane;
 
 public abstract class AbstractViewLayout extends AnchorPane implements MainWindowSupport
@@ -80,4 +81,14 @@ public abstract class AbstractViewLayout extends AnchorPane implements
MainWindo
     {
         return parentComponent;
     }
+
+    public void disable(Node node)
+    {
+        node.setDisable(true);
+    }
+
+    public void enable(Node node)
+    {
+        node.setDisable(false);
+    }
 }

http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/25eb1bc9/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 9ebb186..3bb5a5b 100644
--- a/src/main/java/org/apache/cayenne/modeler/layout/DataDomainLayout.java
+++ b/src/main/java/org/apache/cayenne/modeler/layout/DataDomainLayout.java
@@ -20,23 +20,17 @@
 package org.apache.cayenne.modeler.layout;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.apache.cayenne.modeler.adapters.DataDomainAdapter;
 import org.apache.cayenne.modeler.notification.NotificationCenter;
 import org.apache.cayenne.modeler.notification.event.DataDomainChangeEvent;
 import org.apache.cayenne.modeler.notification.listener.DataDomainListener;
-import org.apache.cayenne.modeler.project.CayenneProject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.TextField;
-import jfxtras.labs.scene.control.BeanPathAdapter;
-import jfxtras.labs.scene.control.BeanPathAdapter.FieldPathValue;
 
 // org.apache.cayenne.modeler.controller.DataDomainViewController
 public class DataDomainLayout
@@ -48,7 +42,7 @@ public class DataDomainLayout
 
 //    private MainWindowLayout mainWindow;
 
-    private static Map<CayenneProject, BeanPathAdapter<CayenneProject>> dataDomainPropertyAdapterMap
= new HashMap<CayenneProject, BeanPathAdapter<CayenneProject>>();
+//    private static Map<CayenneProject, BeanPathAdapter<CayenneProject>> dataDomainPropertyAdapterMap
= new HashMap<CayenneProject, BeanPathAdapter<CayenneProject>>();
 
     @FXML
     private TextField dataDomainNameTextField;
@@ -64,10 +58,10 @@ public class DataDomainLayout
         super(parentComponent, "/layouts/DataDomainLayout.fxml");
     }
 
-    private final ChangeListener<FieldPathValue> changeObserver = (observable, oldValue,
newValue) ->
-        {
-            LOGGER.debug("Observable: " + observable + ", oldValue: " + oldValue + ", newValue:
" + newValue);
-        };
+//    private final ChangeListener<FieldPathValue> changeObserver = (observable, oldValue,
newValue) ->
+//        {
+//            LOGGER.debug("Observable: " + observable + ", oldValue: " + oldValue + ", newValue:
" + newValue);
+//        };
 
     @Override
     public void setPropertyAdapter(final DataDomainAdapter dataDomainAdapter)

http://git-wip-us.apache.org/repos/asf/cayenne-modeler/blob/25eb1bc9/src/main/java/org/apache/cayenne/modeler/layout/ObjectEntityAttributesTabLayout.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/cayenne/modeler/layout/ObjectEntityAttributesTabLayout.java
b/src/main/java/org/apache/cayenne/modeler/layout/ObjectEntityAttributesTabLayout.java
index c4a42b8..52fa1a9 100644
--- a/src/main/java/org/apache/cayenne/modeler/layout/ObjectEntityAttributesTabLayout.java
+++ b/src/main/java/org/apache/cayenne/modeler/layout/ObjectEntityAttributesTabLayout.java
@@ -109,6 +109,7 @@ public class ObjectEntityAttributesTabLayout
         attributeNameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
         attributeTypeColumn.setCellValueFactory(cellData -> cellData.getValue().javaTypeProperty());
         attributeDatabasePathColumn.setCellValueFactory(cellData -> cellData.getValue().databaseAttributePathProperty());
+        // FIXME: See if there is a way of doing this without using the string "databaseType"...
         attributeDatabaseTypeColumn.setCellValueFactory(new PropertyValueFactory<ObjectAttributeAdapter,String>("databaseType"));
 
         attributeUsedForLockingColumn.setCellValueFactory(cellData -> cellData.getValue().usedForLockingProperty());
@@ -231,15 +232,15 @@ public class ObjectEntityAttributesTabLayout
     @Override
     public void beginEditing()
     {
-        javaAttributeNameTextField.setDisable(true);
+        disable(javaAttributeNameTextField);
         javaAttributeNameTextField.setText(null);
 
-        javaTypeComboBox.setDisable(true);
+        disable(javaTypeComboBox);
         javaTypeComboBox.getItems().clear();
         javaTypeComboBox.setValue(null);
 
+        disable(optimisticLockingCheckBox);
         optimisticLockingCheckBox.setSelected(false);
-        optimisticLockingCheckBox.setDisable(true);
 
         databaseTypeLabel.setText("N/A");
 


Mime
View raw message