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 2017/08/21 09:29:15 UTC
[2/9] cayenne git commit: CAY-2351 Remove commons-collections usage
completely enable java 8 by default replace commons-collections with plain
java
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fddb229d/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/UpgradeCayennePreference.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/UpgradeCayennePreference.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/UpgradeCayennePreference.java
index 6861534..cf6d313 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/UpgradeCayennePreference.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/UpgradeCayennePreference.java
@@ -20,15 +20,15 @@ package org.apache.cayenne.pref;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.util.Vector;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
import org.apache.cayenne.modeler.ModelerPreferences;
import org.apache.cayenne.modeler.util.CayenneUserDir;
-import org.apache.commons.collections.ExtendedProperties;
public class UpgradeCayennePreference extends PreferenceDecorator {
@@ -45,6 +45,8 @@ public class UpgradeCayennePreference extends PreferenceDecorator {
public static final String EDITOR_LOGFILE_ENABLED_OLD = "Editor.logfileEnabled";
public static final String EDITOR_LOGFILE_OLD = "Editor.logfile";
+ public static final String DELIMITER = ",";
+
public UpgradeCayennePreference(Preference delegate) {
super(delegate);
}
@@ -56,48 +58,40 @@ public class UpgradeCayennePreference extends PreferenceDecorator {
File prefsFile = new File(preferencesDirectory(), PREFERENCES_NAME_OLD);
if (prefsFile.exists()) {
- ExtendedProperties ep = new ExtendedProperties();
+ Properties ep = new Properties();
try {
ep.load(new FileInputStream(prefsFile));
- Preferences prefEditor = Preferences.userRoot().node(
- CAYENNE_PREFERENCES_PATH).node(EDITOR);
+ Preferences prefEditor = Preferences.userRoot().node(CAYENNE_PREFERENCES_PATH).node(EDITOR);
- prefEditor.putBoolean(
- ModelerPreferences.EDITOR_LOGFILE_ENABLED,
- ep.getBoolean(EDITOR_LOGFILE_ENABLED_OLD));
- prefEditor.put(ModelerPreferences.EDITOR_LOGFILE, ep
- .getString(EDITOR_LOGFILE_OLD));
+ prefEditor.putBoolean(ModelerPreferences.EDITOR_LOGFILE_ENABLED,
+ Boolean.valueOf(ep.getProperty(EDITOR_LOGFILE_ENABLED_OLD)));
+ prefEditor.put(ModelerPreferences.EDITOR_LOGFILE,
+ ep.getProperty(EDITOR_LOGFILE_OLD));
Preferences frefLastProjFiles = prefEditor.node(LAST_PROJ_FILES);
- Vector arr = ep.getVector(LAST_PROJ_FILES_OLD);
-
+ List<String> arr = getVector(ep.getProperty(LAST_PROJ_FILES_OLD));
while (arr.size() > ModelerPreferences.LAST_PROJ_FILES_SIZE) {
arr.remove(arr.size() - 1);
}
frefLastProjFiles.clear();
- int size = arr.size();
- for (int i = 0; i < size; i++) {
- frefLastProjFiles.put(String.valueOf(i), arr
- .get(i)
- .toString());
+ for (int i = 0; i < arr.size(); i++) {
+ frefLastProjFiles.put(String.valueOf(i), arr.get(i));
}
- }
- catch (FileNotFoundException e) {
- e.printStackTrace();
- }
- catch (IOException e) {
+ } catch (IOException e) {
e.printStackTrace();
}
}
}
+ } catch (BackingStoreException ignored) {
}
- catch (BackingStoreException e) {
- // do nothing
- }
+ }
+
+ private List<String> getVector(String value) {
+ return Arrays.asList(value.split(DELIMITER));
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fddb229d/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/TableBinding.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/TableBinding.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/TableBinding.java
index eb5235e..efbd2f5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/TableBinding.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/TableBinding.java
@@ -24,6 +24,7 @@ import java.awt.Component;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -35,7 +36,6 @@ import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
import org.apache.cayenne.util.Util;
-import org.apache.commons.collections.map.SingletonMap;
/**
* A binding for a JTable.
@@ -152,7 +152,7 @@ public class TableBinding extends BindingBase {
// this map is used as "flyweight", providing on the spot context for Ognl
// expression evaluation
- Map listContext = new SingletonMap(ITEM_VAR, null);
+ Map<String, Object> listContext = Collections.singletonMap(ITEM_VAR, null);
public int getColumnCount() {
return headers.length;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fddb229d/modeler/cayenne-wocompat/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-wocompat/pom.xml b/modeler/cayenne-wocompat/pom.xml
index 3ad0344..fccfedd 100644
--- a/modeler/cayenne-wocompat/pom.xml
+++ b/modeler/cayenne-wocompat/pom.xml
@@ -64,6 +64,18 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>code-quality</id>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fddb229d/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java
index ed264a3..c050865 100644
--- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java
+++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java
@@ -26,7 +26,6 @@ import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.Relationship;
-import org.apache.commons.collections.Transformer;
import java.util.ArrayList;
import java.util.Collection;
@@ -35,6 +34,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
+import java.util.function.Function;
/**
* An extension of ObjEntity used to accomodate extra EOModel entity properties.
@@ -154,9 +154,9 @@ public class EOObjEntity extends ObjEntity {
: qualifiedQueryName;
}
- final class DBPathConverter implements Transformer {
+ final class DBPathConverter implements Function<Object, Object> {
- public Object transform(Object input) {
+ public Object apply(Object input) {
if (!(input instanceof Expression)) {
return input;