code cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c24c8b9f Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c24c8b9f Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c24c8b9f Branch: refs/heads/master Commit: c24c8b9ffef4837697cf8717fd6c2287526d62b7 Parents: 17ad5f8 Author: Nikita Timofeev <stari...@gmail.com> Authored: Thu May 17 18:08:09 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Thu May 17 18:08:09 2018 +0300 ---------------------------------------------------------------------- .../apache/cayenne/dbsync/reverse/dbload/EntityLoader.java | 2 +- .../cayenne/modeler/dialog/db/load/DbLoaderContext.java | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/c24c8b9f/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java index 7d279a2..ce0d1fd 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java @@ -82,7 +82,7 @@ class EntityLoader extends PerCatalogAndSchemaLoader { private void addDbEntityToMap(DetectedDbEntity table, DbLoadDataStore map) { DbEntity oldEnt = map.addDbEntitySafe(table); if (oldEnt != null) { - LOGGER.debug("Overwrite DbEntity: " + oldEnt.getName()); + LOGGER.warn("Overwrite DbEntity: " + oldEnt.getName()); delegate.dbEntityRemoved(oldEnt); } delegate.dbEntityAdded(table); http://git-wip-us.apache.org/repos/asf/cayenne/blob/c24c8b9f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java index 4f22c77..9ee8e8f 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java @@ -192,12 +192,7 @@ public class DbLoaderContext { public void processException(final Throwable th, final String message) { LOGGER.info("Exception on reverse engineering", Util.unwindException(th)); - SwingUtilities.invokeLater(new Runnable() { - - public void run() { - JOptionPane.showMessageDialog(Application.getFrame(), th.getMessage(), message, - JOptionPane.ERROR_MESSAGE); - } - }); + SwingUtilities.invokeLater(() -> JOptionPane + .showMessageDialog(Application.getFrame(), th.getMessage(), message, JOptionPane.ERROR_MESSAGE)); } }
