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/16 18:59:04 UTC
[1/2] cayenne git commit: Fixed Data Source test can be invalid in
some cases Minor code cleanup
Repository: cayenne
Updated Branches:
refs/heads/master e308a16f7 -> b0d0faff0
Fixed Data Source test can be invalid in some cases
Minor code cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4f89f55d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4f89f55d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4f89f55d
Branch: refs/heads/master
Commit: 4f89f55df8d26a1ebe1c7a5b22f54b0dd5ff9e0a
Parents: 4bd2cad
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Nov 16 12:06:35 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Nov 16 12:06:35 2016 +0300
----------------------------------------------------------------------
.../dialog/pref/DataSourcePreferences.java | 32 +++++++++-----------
1 file changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4f89f55d/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java
index 0f43513..151d56c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java
@@ -231,19 +231,17 @@ public class DataSourcePreferences extends CayenneController {
List<File> oldPathFiles = ((FileClassLoadingService) getApplication().getClassLoadingService())
.getPathFiles();
- Collection details = new ArrayList<String>();
- for (int i = 0; i < oldPathFiles.size(); i++) {
- details.add(oldPathFiles.get(i).getAbsolutePath());
+ Collection<String> details = new ArrayList<>();
+ for (File oldPathFile : oldPathFiles) {
+ details.add(oldPathFile.getAbsolutePath());
}
Preferences classPathPreferences = getApplication().getPreferencesNode(ClasspathPreferences.class, "");
if (editor.getChangedPreferences().containsKey(classPathPreferences)) {
Map<String, String> map = editor.getChangedPreferences().get(classPathPreferences);
- Iterator iterator = map.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry en = (Map.Entry) iterator.next();
- String key = (String) en.getKey();
+ for (Map.Entry<String, String> en : map.entrySet()) {
+ String key = en.getKey();
if (!details.contains(key)) {
details.add(key);
}
@@ -253,10 +251,8 @@ public class DataSourcePreferences extends CayenneController {
if (editor.getRemovedPreferences().containsKey(classPathPreferences)) {
Map<String, String> map = editor.getRemovedPreferences().get(classPathPreferences);
- Iterator iterator = map.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry en = (Map.Entry) iterator.next();
- String key = (String) en.getKey();
+ for (Map.Entry<String, String> en : map.entrySet()) {
+ String key = en.getKey();
if (details.contains(key)) {
details.remove(key);
}
@@ -282,11 +278,12 @@ public class DataSourcePreferences extends CayenneController {
// connect via Cayenne DriverDataSource - it addresses some driver
// issues...
-
- try (Connection c = new DriverDataSource(driver, currentDataSource.getUrl(),
- currentDataSource.getUserName(), currentDataSource.getPassword()).getConnection();) {
- // do nothing...
- } catch (SQLException e) {
+ // can't use try with resource here as we can loose meaningful exception
+ Connection c = new DriverDataSource(driver, currentDataSource.getUrl(),
+ currentDataSource.getUserName(), currentDataSource.getPassword()).getConnection();
+ try {
+ c.close();
+ } catch (SQLException ignored) {
// i guess we can ignore this...
}
@@ -308,11 +305,10 @@ public class DataSourcePreferences extends CayenneController {
sbMessage.append("\n");
len = 0;
}
- sbMessage.append(tempString + " ");
+ sbMessage.append(tempString).append(" ");
}
JOptionPane.showMessageDialog(null, sbMessage.toString(), "Warning", JOptionPane.WARNING_MESSAGE);
- return;
}
}
}
[2/2] cayenne git commit: Merge branch '133'
Posted by sk...@apache.org.
Merge branch '133'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b0d0faff
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b0d0faff
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b0d0faff
Branch: refs/heads/master
Commit: b0d0faff0890a1ef33dd35304c3d3aaf4eb09b9d
Parents: e308a16 4f89f55
Author: Savva Kolbachev <s....@gmail.com>
Authored: Wed Nov 16 21:49:14 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Wed Nov 16 21:49:14 2016 +0300
----------------------------------------------------------------------
.../dialog/pref/DataSourcePreferences.java | 32 +++++++++-----------
1 file changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------