You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/11/05 08:13:07 UTC
[2/2] cayenne git commit: cleanup, formatting
cleanup, formatting
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c95cbc7e
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c95cbc7e
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c95cbc7e
Branch: refs/heads/master
Commit: c95cbc7e0727b8d7201e5cf087b06c398141aaeb
Parents: 705d5b6
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sat Nov 5 11:09:18 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sat Nov 5 11:12:27 2016 +0300
----------------------------------------------------------------------
.../dbsync/merge/factory/MergerTokenFactoryProvider.java | 6 ++++--
.../apache/cayenne/tools/dbimport/DefaultDbImportAction.java | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c95cbc7e/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/MergerTokenFactoryProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/MergerTokenFactoryProvider.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/MergerTokenFactoryProvider.java
index 3dcb397..121164b 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/MergerTokenFactoryProvider.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/MergerTokenFactoryProvider.java
@@ -29,8 +29,10 @@ import java.util.Map;
*/
public class MergerTokenFactoryProvider extends PerAdapterProvider<MergerTokenFactory> {
- public MergerTokenFactoryProvider(@Inject(DbSyncModule.MERGER_FACTORIES_MAP) Map<String,
- MergerTokenFactory> perAdapterValues, @Inject MergerTokenFactory defaultValue) {
+ public MergerTokenFactoryProvider(
+ @Inject(DbSyncModule.MERGER_FACTORIES_MAP) Map<String, MergerTokenFactory> perAdapterValues,
+ @Inject MergerTokenFactory defaultValue) {
+
super(perAdapterValues, defaultValue);
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c95cbc7e/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
index 05fd502..d19f44d 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
@@ -160,9 +160,11 @@ public class DefaultDbImportAction implements DbImportAction {
DataMap targetDataMap = existingTargetMap(config);
if (targetDataMap == null) {
+
+ String path = config.getTargetDataMap() == null ? "null" : config.getTargetDataMap().getAbsolutePath() + "'";
+
logger.info("");
- logger.info("Map file does not exist. Loaded db model will be saved into '"
- + (config.getTargetDataMap() == null ? "null" : config.getTargetDataMap().getAbsolutePath() + "'"));
+ logger.info("Map file does not exist. Loaded db model will be saved into '" + path);
hasChanges = true;
targetDataMap = newTargetDataMap(config);