You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/11/11 18:39:38 UTC
[1/2] cayenne git commit: - JdbcAdapter changed to more generic
DbAdapter
Repository: cayenne
Updated Branches:
refs/heads/master 9df92ec27 -> 5d8471a83
- JdbcAdapter changed to more generic DbAdapter
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/80f72070
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/80f72070
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/80f72070
Branch: refs/heads/master
Commit: 80f7207030a6f9a034fe6df504c2d40c6782a426
Parents: 2b7a21b
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Nov 9 11:24:31 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Nov 9 11:24:31 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/dialog/db/MergerOptions.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/80f72070/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
index 2608aba..9c417fe 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.dialog.db;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.dba.JdbcAdapter;
+import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dbsync.merge.AbstractToDbToken;
import org.apache.cayenne.dbsync.merge.DbMerger;
import org.apache.cayenne.dbsync.merge.MergeDirection;
@@ -63,10 +63,12 @@ import org.apache.cayenne.validation.ValidationResult;
import org.apache.commons.logging.LogFactory;
import javax.sql.DataSource;
-import javax.swing.*;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.WindowConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.Component;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -83,7 +85,7 @@ public class MergerOptions extends CayenneController {
protected DBConnectionInfo connectionInfo;
protected DataMap dataMap;
- protected JdbcAdapter adapter;
+ protected DbAdapter adapter;
protected String textForSQL;
protected MergerTokenSelectorController tokens;
@@ -161,7 +163,7 @@ public class MergerOptions extends CayenneController {
*/
protected void prepareMigrator() {
try {
- adapter = (JdbcAdapter) connectionInfo.makeAdapter(getApplication().getClassLoadingService());
+ adapter = connectionInfo.makeAdapter(getApplication().getClassLoadingService());
MergerTokenFactory mergerTokenFactory = mergerTokenFactoryProvider.get(adapter);
tokens.setMergerTokenFactory(mergerTokenFactory);
[2/2] cayenne git commit: Merge branch '122'
Posted by sk...@apache.org.
Merge branch '122'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5d8471a8
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5d8471a8
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5d8471a8
Branch: refs/heads/master
Commit: 5d8471a8358a46b704ea3e7f37d53ecb1f8098f5
Parents: 9df92ec 80f7207
Author: Savva Kolbachev <s....@gmail.com>
Authored: Fri Nov 11 21:39:25 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Fri Nov 11 21:39:25 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/dialog/db/MergerOptions.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------