You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/11/05 14:27:12 UTC
[2/5] cayenne git commit: Prevent refresh reverse engineering tab on
data map focus.
Prevent refresh reverse engineering tab on data map focus.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/62bf6c4f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/62bf6c4f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/62bf6c4f
Branch: refs/heads/master
Commit: 62bf6c4f914da4ef1714217ca122f82f4efbcd19
Parents: b9d9378
Author: kkomyak <co...@gmail.com>
Authored: Thu Nov 1 16:47:52 2018 +0300
Committer: kkomyak <co...@gmail.com>
Committed: Thu Nov 1 16:47:52 2018 +0300
----------------------------------------------------------------------
.../reverse/dbimport/DefaultDbImportAction.java | 3 +-
.../modeler/editor/dbimport/DbImportView.java | 50 +++++++++++++-------
2 files changed, 34 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/62bf6c4f/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
index e6b6e61..d0884cc 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
@@ -147,7 +147,7 @@ public class DefaultDbImportAction implements DbImportAction {
commit(config, loadDataMap(config));
}
- protected void commit(DbImportConfiguration config, DataMap sourceDataMap) throws Exception{
+ protected void commit(DbImportConfiguration config, DataMap sourceDataMap) throws Exception {
if (hasChanges) {
DataMap targetDataMap = loadedDataMap;
@@ -157,6 +157,7 @@ public class DefaultDbImportAction implements DbImportAction {
saveLoaded(targetDataMap, config);
this.loadedDataMap = null;
+ this.hasChanges = false;
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/62bf6c4f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java
index 3f0bb3b..f5e97b2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java
@@ -33,6 +33,8 @@ import org.apache.cayenne.modeler.util.CayenneAction;
import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
+import javax.swing.event.AncestorEvent;
+import javax.swing.event.AncestorListener;
import java.awt.BorderLayout;
/**
@@ -65,25 +67,37 @@ public class DbImportView extends JPanel {
}
private void initListeners() {
- projectController.addDataMapDisplayListener(e -> {
- DataMap map = e.getDataMap();
- treePanel.getReverseEngineeringTree().stopEditing();
- if (map != null) {
- treeToolbar.unlockButtons();
- ReverseEngineering reverseEngineering = DbImportView.this.projectController.getApplication().
- getMetaData().get(map, ReverseEngineering.class);
- if (reverseEngineering == null) {
- reverseEngineering = new ReverseEngineering();
- DbImportView.this.projectController.getApplication().getMetaData().add(map, reverseEngineering);
+
+ treePanel.addAncestorListener(new AncestorListener() {
+ @Override
+ public void ancestorAdded(AncestorEvent evPent) {
+ DataMap map = projectController.getCurrentDataMap();
+ treePanel.getReverseEngineeringTree().stopEditing();
+ if (map != null) {
+ treeToolbar.unlockButtons();
+ ReverseEngineering reverseEngineering = DbImportView.this.projectController.getApplication().
+ getMetaData().get(map, ReverseEngineering.class);
+ if (reverseEngineering == null) {
+ reverseEngineering = new ReverseEngineering();
+ DbImportView.this.projectController.getApplication().getMetaData().add(map, reverseEngineering);
+ }
+ configPanel.fillCheckboxes(reverseEngineering);
+ configPanel.initializeTextFields(reverseEngineering);
+ treePanel.updateTree();
+ DbImportTreeNode root = draggableTreePanel.getSourceTree().getRootNode();
+ root.removeAllChildren();
+ draggableTreePanel.updateTree(projectController.getCurrentDataMap());
+ draggableTreePanel.getMoveButton().setEnabled(false);
+ draggableTreePanel.getMoveInvertButton().setEnabled(false);
}
- configPanel.fillCheckboxes(reverseEngineering);
- configPanel.initializeTextFields(reverseEngineering);
- treePanel.updateTree();
- DbImportTreeNode root = draggableTreePanel.getSourceTree().getRootNode();
- root.removeAllChildren();
- draggableTreePanel.updateTree(projectController.getCurrentDataMap());
- draggableTreePanel.getMoveButton().setEnabled(false);
- draggableTreePanel.getMoveInvertButton().setEnabled(false);
+ }
+
+ @Override
+ public void ancestorRemoved(AncestorEvent event) {
+ }
+
+ @Override
+ public void ancestorMoved(AncestorEvent event) {
}
});
}