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/12/18 19:19:14 UTC
cayenne git commit: java 7 style, diamond operator
Repository: cayenne
Updated Branches:
refs/heads/master cee0b77d8 -> 078ae39f8
java 7 style, diamond operator
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/078ae39f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/078ae39f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/078ae39f
Branch: refs/heads/master
Commit: 078ae39f822b936342560cb1bb863c6cba3cd34e
Parents: cee0b77
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sun Dec 18 21:35:31 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sun Dec 18 22:16:31 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/di/spi/DefaultInjector.java | 12 +--
.../lifecycle/changeset/GenericChangeSet.java | 10 +-
.../sort/WeightedAshwoodEntitySorter.java | 12 +--
.../cayenne/DataChannelSyncCallbackAction.java | 2 +-
.../cayenne/access/DataDomainDBDiffBuilder.java | 6 +-
.../access/DataDomainFlattenedBucket.java | 4 +-
.../access/DataDomainLegacyQueryAction.java | 2 +-
.../cayenne/access/DataDomainSyncBucket.java | 2 +-
.../org/apache/cayenne/access/ObjectDiff.java | 6 +-
.../org/apache/cayenne/access/ObjectStore.java | 4 +-
.../access/PrefetchProcessorTreeBuilder.java | 12 +--
.../ResultScanParentAttachmentStrategy.java | 2 +-
.../select/DefaultSelectTranslator.java | 2 +-
.../cayenne/access/types/ExtendedEnumType.java | 10 +-
.../ashwood/graph/IndegreeTopologicalSort.java | 4 +-
.../cayenne/ashwood/graph/MapDigraph.java | 4 +-
.../org/apache/cayenne/dba/TypesHandler.java | 2 +-
.../org/apache/cayenne/dba/TypesMapping.java | 2 +-
.../apache/cayenne/ejbql/parser/Compiler.java | 2 +-
.../java/org/apache/cayenne/graph/GraphMap.java | 2 +-
.../java/org/apache/cayenne/map/DbEntity.java | 102 +++++++++----------
.../java/org/apache/cayenne/map/ObjEntity.java | 8 +-
.../org/apache/cayenne/query/EJBQLQuery.java | 11 +-
.../java/org/apache/cayenne/query/SQLExec.java | 14 +--
.../org/apache/cayenne/query/SQLTemplate.java | 3 +-
.../cayenne/reflect/ConverterFactory.java | 2 +-
.../PersistentDescriptorResultMetadata.java | 8 +-
.../cayenne/reflect/SingletonFaultFactory.java | 8 +-
.../cayenne/util/ObjectDetachOperation.java | 14 +--
.../main/java/org/apache/cayenne/util/Util.java | 4 +-
.../ConcurrentLinkedHashMap.java | 2 +-
.../cayenne/modeler/dialog/FindDialog.java | 8 +-
.../cayenne/modeler/dialog/FindDialogView.java | 43 +++-----
.../modeler/editor/ObjEntityAttributePanel.java | 4 +-
.../modeler/editor/ProcedureQueryView.java | 36 +++----
.../modeler/editor/SQLTemplateMainTab.java | 33 +++---
.../cayenne/modeler/graph/GraphRegistry.java | 8 +-
.../cayenne/modeler/graph/ObjGraphBuilder.java | 12 +--
.../modeler/undo/RemoveUndoableEdit.java | 25 +++--
.../cayenne/modeler/util/EntityTreeModel.java | 17 ++--
.../swing/components/textpane/TextPaneView.java | 33 +++---
.../textpane/style/TextPaneStyleMap.java | 9 +-
42 files changed, 234 insertions(+), 272 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java
index 772ba5d..a998cf4 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java
@@ -18,10 +18,6 @@
****************************************************************/
package org.apache.cayenne.di.spi;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Key;
@@ -29,6 +25,10 @@ import org.apache.cayenne.di.Module;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.di.Scope;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
/**
* A default Cayenne implementations of a DI injector.
*
@@ -52,8 +52,8 @@ public class DefaultInjector implements Injector {
// this is intentionally hardcoded and is not configurable
this.defaultScope = singletonScope;
- this.bindings = new HashMap<Key<?>, Binding<?>>();
- this.decorations = new HashMap<Key<?>, Decoration<?>>();
+ this.bindings = new HashMap<>();
+ this.decorations = new HashMap<>();
this.injectionStack = new InjectionStack();
DefaultBinder binder = new DefaultBinder(this);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/GenericChangeSet.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/GenericChangeSet.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/GenericChangeSet.java
index cb06a53..cf9519a 100644
--- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/GenericChangeSet.java
+++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/GenericChangeSet.java
@@ -18,15 +18,15 @@
****************************************************************/
package org.apache.cayenne.lifecycle.changeset;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.graph.GraphChangeHandler;
import org.apache.cayenne.graph.GraphDiff;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* A {@link ChangeSet} implemented as a wrapper on top of {@link GraphDiff} of unspecified
* nature.
@@ -61,7 +61,7 @@ public class GenericChangeSet implements ChangeSet {
private Map<ObjectId, Map<String, PropertyChange>> parseDiff() {
- final Map<ObjectId, Map<String, PropertyChange>> changes = new HashMap<ObjectId, Map<String, PropertyChange>>();
+ final Map<ObjectId, Map<String, PropertyChange>> changes = new HashMap<>();
diff.apply(new GraphChangeHandler() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/sort/WeightedAshwoodEntitySorter.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/sort/WeightedAshwoodEntitySorter.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/sort/WeightedAshwoodEntitySorter.java
index 542e711..89ab219 100644
--- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/sort/WeightedAshwoodEntitySorter.java
+++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/sort/WeightedAshwoodEntitySorter.java
@@ -18,16 +18,16 @@
****************************************************************/
package org.apache.cayenne.lifecycle.sort;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.cayenne.ashwood.AshwoodEntitySorter;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.ObjEntity;
import org.apache.commons.collections.comparators.ReverseComparator;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* EntitySorter that takes into account entity "weights", and otherwise delegating to
* another (topological) sorter.
@@ -51,7 +51,7 @@ public class WeightedAshwoodEntitySorter extends AshwoodEntitySorter {
protected void doIndexSorter() {
super.doIndexSorter();
- entityWeights = new HashMap<DbEntity, Integer>();
+ entityWeights = new HashMap<>();
for (ObjEntity entity : entityResolver.getObjEntities()) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/DataChannelSyncCallbackAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/DataChannelSyncCallbackAction.java b/cayenne-server/src/main/java/org/apache/cayenne/DataChannelSyncCallbackAction.java
index 5414ac5..32013f2 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/DataChannelSyncCallbackAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/DataChannelSyncCallbackAction.java
@@ -70,7 +70,7 @@ public abstract class DataChannelSyncCallbackAction implements GraphChangeHandle
this.graphManager = graphManager;
if (hasListeners()) {
- this.seenIds = new HashMap<Object, Op>();
+ this.seenIds = new HashMap<>();
changes.apply(this);
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainDBDiffBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainDBDiffBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainDBDiffBuilder.java
index 0562fc2..d1da31e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainDBDiffBuilder.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainDBDiffBuilder.java
@@ -148,7 +148,7 @@ class DataDomainDBDiffBuilder implements GraphChangeHandler {
// diffs
if (currentPropertyDiff == null) {
- currentPropertyDiff = new HashMap<Object, Object>();
+ currentPropertyDiff = new HashMap<>();
}
currentPropertyDiff.put(property, newValue);
@@ -178,7 +178,7 @@ class DataDomainDBDiffBuilder implements GraphChangeHandler {
private void doArcCreated(Object targetNodeId, Object arcId) {
if (currentArcDiff == null) {
- currentArcDiff = new HashMap<Object, Object>();
+ currentArcDiff = new HashMap<>();
}
currentArcDiff.put(arcId, targetNodeId);
}
@@ -208,7 +208,7 @@ class DataDomainDBDiffBuilder implements GraphChangeHandler {
private void doArcDeleted(Object targetNodeId, Object arcId) {
if (currentArcDiff == null) {
- currentArcDiff = new HashMap<Object, Object>();
+ currentArcDiff = new HashMap<>();
currentArcDiff.put(arcId, null);
} else {
// skip deletion record if a substitute arc was created prior to
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainFlattenedBucket.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainFlattenedBucket.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainFlattenedBucket.java
index 3e9d23c..761434c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainFlattenedBucket.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainFlattenedBucket.java
@@ -48,8 +48,8 @@ class DataDomainFlattenedBucket {
DataDomainFlattenedBucket(DataDomainFlushAction parent) {
this.parent = parent;
- this.insertArcKeys = new HashMap<DbEntity, List<FlattenedArcKey>>();
- this.flattenedDeleteQueries = new HashMap<DbEntity, DeleteBatchQuery>();
+ this.insertArcKeys = new HashMap<>();
+ this.flattenedDeleteQueries = new HashMap<>();
}
boolean isEmpty() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
index 318950a..42fd089 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
@@ -86,7 +86,7 @@ class DataDomainLegacyQueryAction implements QueryRouter, OperationObserver {
List<Query> queries = null;
if (queriesByNode == null) {
- queriesByNode = new HashMap<QueryEngine, List<Query>>();
+ queriesByNode = new HashMap<>();
}
else {
queries = queriesByNode.get(engine);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java
index 46e9fcd..7436dcc 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java
@@ -58,7 +58,7 @@ abstract class DataDomainSyncBucket {
Map<DbEntity, Collection<DbEntityClassDescriptor>> descriptorsByDbEntity;
DataDomainSyncBucket(DataDomainFlushAction parent) {
- this.objectsByDescriptor = new HashMap<ClassDescriptor, List<Persistent>>();
+ this.objectsByDescriptor = new HashMap<>();
this.parent = parent;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectDiff.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectDiff.java b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectDiff.java
index 68b5be0..0928b32 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectDiff.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectDiff.java
@@ -213,7 +213,7 @@ class ObjectDiff extends NodeDiff {
if (relationship.isFlattened()) {
if (flatIds == null) {
- flatIds = new HashMap<ArcOperation, ArcOperation>();
+ flatIds = new HashMap<>();
}
ArcOperation oldOp = flatIds.put(arcDiff, arcDiff);
@@ -239,7 +239,7 @@ class ObjectDiff extends NodeDiff {
} else if (property instanceof ToOneProperty) {
if (currentArcSnapshot == null) {
- currentArcSnapshot = new HashMap<String, Object>();
+ currentArcSnapshot = new HashMap<>();
}
currentArcSnapshot.put(arcId, targetId);
@@ -277,7 +277,7 @@ class ObjectDiff extends NodeDiff {
currentArcSnapshot.put(arcId, arcDiff.getTargetNodeId());
if (phantomFks == null) {
- phantomFks = new HashMap<ArcOperation, ArcOperation>();
+ phantomFks = new HashMap<>();
}
ArcOperation oldOp = phantomFks.put(arcDiff, arcDiff);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectStore.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectStore.java b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectStore.java
index ad0fa23..b9cf3f5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectStore.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectStore.java
@@ -354,7 +354,7 @@ public class ObjectStore implements Serializable, SnapshotEventListener, GraphMa
// reset changes ... using new HashMap to allow event listeners to analyze the
// original changes map after the rollback
- this.changes = new HashMap<Object, ObjectDiff>();
+ this.changes = new HashMap<>();
}
/**
@@ -454,7 +454,7 @@ public class ObjectStore implements Serializable, SnapshotEventListener, GraphMa
// create new instance of changes map so that event listeners who stored the
// original diff don't get affected
- this.changes = new HashMap<Object, ObjectDiff>();
+ this.changes = new HashMap<>();
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilder.java
index ac1c3cf..9aad5e6 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilder.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilder.java
@@ -18,11 +18,6 @@
****************************************************************/
package org.apache.cayenne.access;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.Persistent;
@@ -32,6 +27,11 @@ import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.reflect.ArcProperty;
import org.apache.cayenne.reflect.ClassDescriptor;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
final class PrefetchProcessorTreeBuilder implements PrefetchProcessor {
private QueryMetadata queryMetadata;
@@ -63,7 +63,7 @@ final class PrefetchProcessorTreeBuilder implements PrefetchProcessor {
// TODO: there are other places that are attempting to track objects in
// a tx... can we reuse 'seen' map from here?
- this.seen = new HashMap<ObjectId, Persistent>();
+ this.seen = new HashMap<>();
this.root = null;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/access/ResultScanParentAttachmentStrategy.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/ResultScanParentAttachmentStrategy.java b/cayenne-server/src/main/java/org/apache/cayenne/access/ResultScanParentAttachmentStrategy.java
index cbbe4e1..fa14c2f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/ResultScanParentAttachmentStrategy.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/ResultScanParentAttachmentStrategy.java
@@ -97,7 +97,7 @@ class ResultScanParentAttachmentStrategy implements ParentAttachmentStrategy {
}
private void indexParents() {
- partitionByChild = new HashMap<Object, List<Persistent>>();
+ partitionByChild = new HashMap<>();
List<Persistent> objects = parentNode.getObjects();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java
index 22f1ed6..65d84ed 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java
@@ -552,7 +552,7 @@ public class DefaultSelectTranslator extends QueryAssembler implements SelectTra
if (attribute.getName().equals(column.getName())) {
if (attributeOverrides == null) {
- attributeOverrides = new HashMap<ObjAttribute, ColumnDescriptor>();
+ attributeOverrides = new HashMap<>();
}
// kick out the original attribute
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/access/types/ExtendedEnumType.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/types/ExtendedEnumType.java b/cayenne-server/src/main/java/org/apache/cayenne/access/types/ExtendedEnumType.java
index 6b49197..b37e07d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/types/ExtendedEnumType.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/types/ExtendedEnumType.java
@@ -19,6 +19,10 @@
package org.apache.cayenne.access.types;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.ExtendedEnumeration;
+import org.apache.cayenne.dba.TypesMapping;
+
import java.lang.reflect.Method;
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
@@ -26,10 +30,6 @@ import java.sql.ResultSet;
import java.util.HashMap;
import java.util.Map;
-import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.ExtendedEnumeration;
-import org.apache.cayenne.dba.TypesMapping;
-
/**
* An ExtendedType that handles a Java Enum based upon the Cayenne ExtendedEnumeration
* interface. The ExtendedEnumeration interface requires the developer to specify the
@@ -46,7 +46,7 @@ public class ExtendedEnumType<T extends Enum<T>> implements ExtendedType {
// Contains a mapping of database values (Integer or String) and the
// Enum for that value. This is to facilitate mapping database values
// back to the Enum upon reading them from the database.
- private Map<Object, Enum<T>> enumerationMappings = new HashMap<Object, Enum<T>>();
+ private Map<Object, Enum<T>> enumerationMappings = new HashMap<>();
public ExtendedEnumType(Class<T> enumerationClass) {
if (enumerationClass == null)
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/ashwood/graph/IndegreeTopologicalSort.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/ashwood/graph/IndegreeTopologicalSort.java b/cayenne-server/src/main/java/org/apache/cayenne/ashwood/graph/IndegreeTopologicalSort.java
index d984a11..597edaa 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/ashwood/graph/IndegreeTopologicalSort.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/ashwood/graph/IndegreeTopologicalSort.java
@@ -72,8 +72,8 @@ import java.util.Map;
public class IndegreeTopologicalSort<E> implements Iterator<E> {
private Digraph<E, ?> digraph;
- private List<E> vertices = new LinkedList<E>();
- private Map<E, InDegree> inDegrees = new HashMap<E, InDegree>();
+ private List<E> vertices = new LinkedList<>();
+ private Map<E, InDegree> inDegrees = new HashMap<>();
private ListIterator<E> current;
public IndegreeTopologicalSort(Digraph<E, ?> digraph) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/ashwood/graph/MapDigraph.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/ashwood/graph/MapDigraph.java b/cayenne-server/src/main/java/org/apache/cayenne/ashwood/graph/MapDigraph.java
index 9045eef..1526379 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/ashwood/graph/MapDigraph.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/ashwood/graph/MapDigraph.java
@@ -74,7 +74,7 @@ public class MapDigraph<E, V> implements Digraph<E, V> {
private int size;
public MapDigraph() {
- graph = new HashMap<E, Map<E, V>>();
+ graph = new HashMap<>();
}
@Override
@@ -104,7 +104,7 @@ public class MapDigraph<E, V> implements Digraph<E, V> {
public V putArc(E origin, E destination, V arc) {
Map<E, V> destinations = graph.get(origin);
if (destinations == null) {
- destinations = new HashMap<E, V>();
+ destinations = new HashMap<>();
graph.put(origin, destinations);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesHandler.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesHandler.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesHandler.java
index 0f07b25..bf87286 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesHandler.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesHandler.java
@@ -42,7 +42,7 @@ import java.util.Map;
*/
public class TypesHandler {
- private static Map<URL, TypesHandler> handlerMap = new HashMap<URL, TypesHandler>();
+ private static Map<URL, TypesHandler> handlerMap = new HashMap<>();
protected Map<Integer, String[]> typesMap;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesMapping.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesMapping.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesMapping.java
index b42eb9b..30e7aa8 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesMapping.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesMapping.java
@@ -511,7 +511,7 @@ public class TypesMapping {
return SQL_ENUM_JAVA.get(type);
}
- protected Map<Integer, List<TypeInfo>> databaseTypes = new HashMap<Integer, List<TypeInfo>>();
+ protected Map<Integer, List<TypeInfo>> databaseTypes = new HashMap<>();
public TypesMapping(DatabaseMetaData metaData) throws SQLException {
// map database types to standard JDBC types
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java b/cayenne-server/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
index f26163b..95a728b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
@@ -86,7 +86,7 @@ class Compiler {
CompiledExpression compile(String source, EJBQLExpression parsed) {
parsed.visit(new CompilationVisitor());
- Map<EJBQLPath, Integer> pathsInSelect = new HashMap<EJBQLPath, Integer>();
+ Map<EJBQLPath, Integer> pathsInSelect = new HashMap<>();
if (parsed != null) {
for (int i = 0; i < parsed.getChildrenCount(); i++) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/graph/GraphMap.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/graph/GraphMap.java b/cayenne-server/src/main/java/org/apache/cayenne/graph/GraphMap.java
index 48cf9ff..cd4c1f6 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/graph/GraphMap.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/graph/GraphMap.java
@@ -43,7 +43,7 @@ public class GraphMap implements GraphManager {
* Creates a new GraphMap.
*/
public GraphMap() {
- this.nodes = new HashMap<Object, Object>();
+ this.nodes = new HashMap<>();
}
// *** GraphMap methods
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/map/DbEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/DbEntity.java b/cayenne-server/src/main/java/org/apache/cayenne/map/DbEntity.java
index 391fdc0..3a26d15 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/DbEntity.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/DbEntity.java
@@ -110,7 +110,7 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
/**
* Prints itself as XML to the provided XMLEncoder.
- *
+ *
* @since 1.1
*/
@Override
@@ -156,13 +156,13 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
*/
public String getFullyQualifiedName() {
return ((catalog != null && !catalog.isEmpty()) ? catalog + '.' : "")
- + ((schema != null && !schema.isEmpty()) ? schema + '.' : "")
- + name;
+ + ((schema != null && !schema.isEmpty()) ? schema + '.' : "")
+ + name;
}
/**
* Returns database schema of this table.
- *
+ *
* @return table's schema, null if not set.
*/
public String getSchema() {
@@ -193,7 +193,7 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
/**
* Returns an unmodifiable collection of DbAttributes representing the
* primary key of the table described by this DbEntity.
- *
+ *
* @since 3.0
*/
public Collection<DbAttribute> getPrimaryKeys() {
@@ -212,7 +212,7 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
/**
* Returns an unmodifiable collection of DbAttributes that are generated by
* the database.
- *
+ *
* @since 1.2
*/
public Collection<DbAttribute> getGeneratedAttributes() {
@@ -221,12 +221,10 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
/**
* Adds a new attribute to this entity.
- *
- * @throws IllegalArgumentException
- * if Attribute has no name or there is an existing attribute
- * with the same name
- * @throws IllegalArgumentException
- * if a relationship has the same name as this attribute
+ *
+ * @throws IllegalArgumentException if Attribute has no name or there is an existing attribute
+ * with the same name
+ * @throws IllegalArgumentException if a relationship has the same name as this attribute
* @since 3.0
*/
public void addAttribute(DbAttribute attr) {
@@ -238,7 +236,7 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
* Removes attribute from the entity, removes any relationship joins
* containing this attribute. Does nothing if the attribute name is not
* found.
- *
+ *
* @see org.apache.cayenne.map.Entity#removeAttribute(String)
*/
@Override
@@ -299,7 +297,7 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
/**
* Returns an Iterable instance over expression path components based on
* this entity.
- *
+ *
* @since 3.0
*/
@Override
@@ -350,7 +348,7 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
* DbEntity property changed event. May be name, attribute or relationship
* added or removed, etc. Attribute and relationship property changes are
* handled in respective listeners.
- *
+ *
* @since 1.2
*/
public void dbEntityChanged(EntityEvent e) {
@@ -473,44 +471,44 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
// handle PK refresh
if (primaryKey.contains(dbAttribute) || dbAttribute.isPrimaryKey()) {
switch (e.getId()) {
- case MapEvent.ADD:
- this.primaryKey.add(dbAttribute);
- break;
+ case MapEvent.ADD:
+ this.primaryKey.add(dbAttribute);
+ break;
- case MapEvent.REMOVE:
- this.primaryKey.remove(dbAttribute);
- break;
+ case MapEvent.REMOVE:
+ this.primaryKey.remove(dbAttribute);
+ break;
- default:
- // generic update
- this.primaryKey.clear();
- for (DbAttribute next : getAttributes()) {
- if (next.isPrimaryKey()) {
- this.primaryKey.add(next);
+ default:
+ // generic update
+ this.primaryKey.clear();
+ for (DbAttribute next : getAttributes()) {
+ if (next.isPrimaryKey()) {
+ this.primaryKey.add(next);
+ }
}
- }
}
}
// handle generated key refresh
if (generatedAttributes.contains(dbAttribute) || dbAttribute.isGenerated()) {
switch (e.getId()) {
- case MapEvent.ADD:
- this.generatedAttributes.add(dbAttribute);
- break;
+ case MapEvent.ADD:
+ this.generatedAttributes.add(dbAttribute);
+ break;
- case MapEvent.REMOVE:
- this.generatedAttributes.remove(dbAttribute);
- break;
+ case MapEvent.REMOVE:
+ this.generatedAttributes.remove(dbAttribute);
+ break;
- default:
- // generic update
- this.generatedAttributes.clear();
- for (DbAttribute next : getAttributes()) {
- if (next.isGenerated()) {
- this.generatedAttributes.add(next);
+ default:
+ // generic update
+ this.generatedAttributes.clear();
+ for (DbAttribute next : getAttributes()) {
+ if (next.isGenerated()) {
+ this.generatedAttributes.add(next);
+ }
}
- }
}
}
}
@@ -556,19 +554,23 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
}
}
- /** Relationship has been created/added. */
+ /**
+ * Relationship has been created/added.
+ */
public void dbRelationshipAdded(RelationshipEvent e) {
// does nothing currently
}
- /** Relationship has been removed. */
+ /**
+ * Relationship has been removed.
+ */
public void dbRelationshipRemoved(RelationshipEvent e) {
// does nothing currently
}
/**
* @return qualifier that will be ANDed to all select queries with this
- * entity
+ * entity
*/
public Expression getQualifier() {
return qualifier;
@@ -585,7 +587,7 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
* Returns true if there is full replacement id is attached to an ObjectId.
* "Full" means that all PK columns are present and only PK columns are
* present.
- *
+ *
* @since 1.2
*/
public boolean isFullReplacementIdAttached(ObjectId id) {
@@ -625,7 +627,7 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
/**
* Transforms Expression rooted in this entity to an analogous expression
* rooted in related entity.
- *
+ *
* @since 1.1
*/
@Override
@@ -681,12 +683,8 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
}
private PathComponentIterator createPathIterator(String path) {
- return new PathComponentIterator(DbEntity.this, path, new HashMap<String, String>()); // TODO:
- // do
- // we
- // need
- // aliases
- // here?
+ return new PathComponentIterator(DbEntity.this, path, new HashMap<String, String>());
+ // TODO: do we need aliases here?
}
String translatePath(String path) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/map/ObjEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/ObjEntity.java b/cayenne-server/src/main/java/org/apache/cayenne/map/ObjEntity.java
index ad466b2..f54ecb9 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/ObjEntity.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/ObjEntity.java
@@ -1109,12 +1109,8 @@ public class ObjEntity extends Entity implements ObjEntityListener, Configuratio
}
private PathComponentIterator createPathIterator(String path) {
- return new PathComponentIterator(ObjEntity.this, path, new HashMap<String, String>()); // TODO:
- // do
- // we
- // need
- // aliases
- // here?
+ return new PathComponentIterator(ObjEntity.this, path, new HashMap<String, String>());
+ // TODO: do we need aliases here?
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
index 9ce3d2f..a25a25f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
@@ -18,12 +18,7 @@
****************************************************************/
package org.apache.cayenne.query;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.ejbql.EJBQLCompiledExpression;
import org.apache.cayenne.ejbql.EJBQLException;
import org.apache.cayenne.ejbql.EJBQLParserFactory;
@@ -32,6 +27,10 @@ import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* An EJBQL query representation in Cayenne.
*
@@ -236,7 +235,7 @@ public class EJBQLQuery implements Query, XMLSerializable {
// spec requires it.
if (positionalParameters == null) {
- positionalParameters = new HashMap<Integer, Object>();
+ positionalParameters = new HashMap<>();
}
positionalParameters.put(Integer.valueOf(position), object);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/query/SQLExec.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLExec.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLExec.java
index 213bd1c..7ce8044 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLExec.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLExec.java
@@ -18,12 +18,6 @@
****************************************************************/
package org.apache.cayenne.query;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.QueryResponse;
@@ -32,6 +26,12 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.util.QueryResultBuilder;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* A generic query based on raw SQL and featuring fluent API. While
* {@link SQLExec} can be used to select data (see {@link #execute(ObjectContext)}
@@ -92,7 +92,7 @@ public class SQLExec extends IndirectQuery {
public SQLExec params(Map<String, ?> parameters) {
if (this.params == null) {
- this.params = new HashMap<String, Object>(parameters);
+ this.params = new HashMap<>(parameters);
} else {
Map bareMap = parameters;
this.params.putAll(bareMap);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
index 114c500..c2a6d76 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
@@ -648,8 +648,7 @@ public class SQLTemplate extends AbstractQuery implements ParameterizedQuery, XM
// are not serializable with Hessian...
this.parameters = new Map[parameters.length];
for (int i = 0; i < parameters.length; i++) {
- this.parameters[i] = parameters[i] != null ? new HashMap<>(parameters[i])
- : new HashMap<String, Object>();
+ this.parameters[i] = parameters[i] != null ? new HashMap<>(parameters[i]) : new HashMap<String, Object>();
}
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java
index 51e464c..c0d0b61 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java
@@ -240,7 +240,7 @@ public class ConverterFactory {
// TODO: byte[] converter...
- converters = new HashMap<Class<?>, Converter<?>>();
+ converters = new HashMap<>();
_addConverter(Boolean.class, toBooleanConverter);
_addConverter(boolean.class, toBooleanConverter);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/reflect/PersistentDescriptorResultMetadata.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/reflect/PersistentDescriptorResultMetadata.java b/cayenne-server/src/main/java/org/apache/cayenne/reflect/PersistentDescriptorResultMetadata.java
index 1f4ab53..09acf5e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/reflect/PersistentDescriptorResultMetadata.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/reflect/PersistentDescriptorResultMetadata.java
@@ -18,13 +18,13 @@
****************************************************************/
package org.apache.cayenne.reflect;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.query.EntityResultSegment;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @since 3.0
*/
@@ -37,7 +37,7 @@ class PersistentDescriptorResultMetadata implements EntityResultSegment {
PersistentDescriptorResultMetadata(ClassDescriptor classDescriptor) {
this.classDescriptor = classDescriptor;
this.fields = new HashMap<>();
- this.reverseFields = new HashMap<String, String>();
+ this.reverseFields = new HashMap<>();
}
public ClassDescriptor getClassDescriptor() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/reflect/SingletonFaultFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/reflect/SingletonFaultFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/reflect/SingletonFaultFactory.java
index 251b26a..208264f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/reflect/SingletonFaultFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/reflect/SingletonFaultFactory.java
@@ -18,15 +18,15 @@
****************************************************************/
package org.apache.cayenne.reflect;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.cayenne.Fault;
import org.apache.cayenne.access.ToManyListFault;
import org.apache.cayenne.access.ToManyMapFault;
import org.apache.cayenne.access.ToManySetFault;
import org.apache.cayenne.access.ToOneFault;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @since 3.0
*/
@@ -35,7 +35,7 @@ public class SingletonFaultFactory implements FaultFactory {
protected Fault toOneFault = new ToOneFault();
protected Fault listFault = new ToManyListFault();
protected Fault setFault = new ToManySetFault();
- protected Map<Accessor, Fault> mapFaults = new HashMap<Accessor, Fault>();
+ protected Map<Accessor, Fault> mapFaults = new HashMap<>();
public Fault getCollectionFault() {
return listFault;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java b/cayenne-server/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java
index dc63a1b..c415859 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java
@@ -19,12 +19,6 @@
package org.apache.cayenne.util;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.Persistent;
@@ -39,6 +33,12 @@ import org.apache.cayenne.reflect.ToManyMapProperty;
import org.apache.cayenne.reflect.ToManyProperty;
import org.apache.cayenne.reflect.ToOneProperty;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
/**
* An operation that creates a subgraph of detached objects, using the PrefetchTree to
* delineate the graph boundaries. Target objects can be described by a different set of
@@ -53,7 +53,7 @@ public class ObjectDetachOperation {
public ObjectDetachOperation(EntityResolver targetResolver) {
this.targetResolver = targetResolver;
- this.seen = new HashMap<ObjectId, Persistent>();
+ this.seen = new HashMap<>();
}
public void reset() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java b/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java
index 3ee62ba..ba30b97 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java
@@ -312,14 +312,14 @@ public class Util {
if (keysSize == 0 && valuesSize == 0) {
// return mutable map
- return new HashMap<K, V>();
+ return new HashMap<>();
}
if (keysSize != valuesSize) {
throw new IllegalArgumentException("The number of keys doesn't match the number of values.");
}
- Map<K, V> map = new HashMap<K, V>();
+ Map<K, V> map = new HashMap<>();
for (int i = 0; i < keysSize; i++) {
map.put(keys[i], values[i]);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/cayenne-server/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java b/cayenne-server/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java
index 660cb05..a2f6e51 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java
@@ -1597,7 +1597,7 @@ public class ConcurrentLinkedHashMap<K, V> extends AbstractMap<K, V> implements
SerializationProxy(ConcurrentLinkedHashMap<K, V> map) {
concurrencyLevel = map.concurrencyLevel;
- data = new HashMap<K, V>(map);
+ data = new HashMap<>(map);
capacity = map.capacity;
listener = map.listener;
weigher = map.weigher;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
index aeb6dca..99fc743 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
@@ -75,7 +75,13 @@ public class FindDialog extends CayenneController {
this.paths = paths;
- Map<Integer, String> objEntityNames = new HashMap<Integer, String>(), dbEntityNames = new HashMap<Integer, String>(), attrNames = new HashMap<Integer, String>(), relatNames = new HashMap<Integer, String>(), queryNames = new HashMap<Integer, String>(), embeddableNames = new HashMap<Integer, String>(), embeddableAttributeNames = new HashMap<Integer, String>();
+ Map<Integer, String> objEntityNames = new HashMap<>();
+ Map<Integer, String> dbEntityNames = new HashMap<>();
+ Map<Integer, String> attrNames = new HashMap<>();
+ Map<Integer, String> relatNames = new HashMap<>();
+ Map<Integer, String> queryNames = new HashMap<>();
+ Map<Integer, String> embeddableNames = new HashMap<>();
+ Map<Integer, String> embeddableAttributeNames = new HashMap<>();
Iterator it = paths.iterator();
int index = 0;
while (it.hasNext()) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialogView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialogView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialogView.java
index 8353bcb..07a02a9 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialogView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialogView.java
@@ -18,36 +18,6 @@
****************************************************************/
package org.apache.cayenne.modeler.dialog;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.event.KeyEvent;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.Map.Entry;
-
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.KeyStroke;
-import javax.swing.ListSelectionModel;
-import javax.swing.table.DefaultTableCellRenderer;
-
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjAttribute;
@@ -57,6 +27,17 @@ import org.apache.cayenne.modeler.util.CellRenderers;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.swing.ImageRendererColumn;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
/**
* Swing component displaying results produced by search feature.
@@ -106,7 +87,7 @@ public class FindDialogView extends JDialog {
TableModel tableModel = new TableModel();
- LabelAndObjectIndex = new HashMap<JLabel, Integer>();
+ LabelAndObjectIndex = new HashMap<>();
dataVector = createResultTable(objEntityNames, CellRenderers
.iconForObject(new ObjEntity()), dataVector, curentLineInTable);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
index 6dc7290..1d6645a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
@@ -336,8 +336,8 @@ public class ObjEntityAttributePanel extends JPanel implements ObjEntityDisplayL
}
protected void setUpTableStructure() {
- Map<Integer, Integer> minSizes = new HashMap<Integer, Integer>();
- Map<Integer, Integer> maxSizes = new HashMap<Integer, Integer>();
+ Map<Integer, Integer> minSizes = new HashMap<>();
+ Map<Integer, Integer> maxSizes = new HashMap<>();
minSizes.put(ObjAttributeTableModel.INHERITED, INHERITANCE_COLUMN_WIDTH);
maxSizes.put(ObjAttributeTableModel.INHERITED, INHERITANCE_COLUMN_WIDTH);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java
index b6aa3bc..23c69d7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java
@@ -19,21 +19,10 @@
package org.apache.cayenne.modeler.editor;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JComboBox;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
+import com.jgoodies.forms.builder.PanelBuilder;
+import com.jgoodies.forms.layout.CellConstraints;
+import com.jgoodies.forms.layout.FormLayout;
+import com.jgoodies.forms.layout.RowSpec;
import org.apache.cayenne.configuration.event.QueryEvent;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
@@ -47,14 +36,19 @@ import org.apache.cayenne.modeler.util.CellRenderers;
import org.apache.cayenne.modeler.util.Comparators;
import org.apache.cayenne.modeler.util.ProjectUtil;
import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.query.*;
+import org.apache.cayenne.query.CapsStrategy;
+import org.apache.cayenne.query.ProcedureQuery;
+import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationException;
-import com.jgoodies.forms.builder.PanelBuilder;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-import com.jgoodies.forms.layout.RowSpec;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
/**
*/
@@ -68,7 +62,7 @@ public class ProcedureQueryView extends JPanel {
CapsStrategy.DEFAULT, CapsStrategy.LOWER, CapsStrategy.UPPER
};
- private static final Map<CapsStrategy, String> labelCapsLabels = new HashMap<CapsStrategy, String>();
+ private static final Map<CapsStrategy, String> labelCapsLabels = new HashMap<>();
static {
labelCapsLabels.put(CapsStrategy.DEFAULT, DEFAULT_CAPS_LABEL);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
index cb3aa05..4433c53 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
@@ -19,20 +19,10 @@
package org.apache.cayenne.modeler.editor;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JComboBox;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
+import com.jgoodies.forms.builder.PanelBuilder;
+import com.jgoodies.forms.layout.CellConstraints;
+import com.jgoodies.forms.layout.FormLayout;
+import com.jgoodies.forms.layout.RowSpec;
import org.apache.cayenne.configuration.event.QueryEvent;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
@@ -41,14 +31,17 @@ import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.ProjectUtil;
import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.query.*;
+import org.apache.cayenne.query.CapsStrategy;
+import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationException;
-import com.jgoodies.forms.builder.PanelBuilder;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-import com.jgoodies.forms.layout.RowSpec;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.HashMap;
+import java.util.Map;
/**
* A main panel for editing a SQLTemplate.
@@ -64,7 +57,7 @@ public class SQLTemplateMainTab extends JPanel {
CapsStrategy.DEFAULT, CapsStrategy.LOWER, CapsStrategy.UPPER
};
- private static final Map<CapsStrategy, String> labelCapsLabels = new HashMap<CapsStrategy, String>();
+ private static final Map<CapsStrategy, String> labelCapsLabels = new HashMap<>();
static {
labelCapsLabels.put(CapsStrategy.DEFAULT, DEFAULT_CAPS_LABEL);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/GraphRegistry.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/GraphRegistry.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/GraphRegistry.java
index 150fb22..75ffc9a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/GraphRegistry.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/GraphRegistry.java
@@ -18,15 +18,15 @@
****************************************************************/
package org.apache.cayenne.modeler.graph;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.event.DomainEvent;
import org.apache.cayenne.configuration.event.DomainListener;
import org.apache.cayenne.modeler.ProjectController;
import org.jgraph.JGraph;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Class for storing information about datadomain's builders.
* Has methods for saving and loading graphs, as well as building graph for
@@ -41,7 +41,7 @@ public class GraphRegistry implements DomainListener {
Map<DataChannelDescriptor, GraphMap> graphMaps;
public GraphRegistry() {
- graphMaps = new HashMap<DataChannelDescriptor, GraphMap>();
+ graphMaps = new HashMap<>();
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/ObjGraphBuilder.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/ObjGraphBuilder.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/ObjGraphBuilder.java
index f1a1453..d793f01 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/ObjGraphBuilder.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/ObjGraphBuilder.java
@@ -18,11 +18,6 @@
****************************************************************/
package org.apache.cayenne.modeler.graph;
-import java.awt.Color;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Entity;
@@ -40,6 +35,11 @@ import org.jgraph.graph.DefaultEdge;
import org.jgraph.graph.DefaultGraphCell;
import org.jgraph.graph.GraphConstants;
+import java.awt.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Builder of ObjEntity information-based graph (relative to UML class diagram)
*/
@@ -51,7 +51,7 @@ class ObjGraphBuilder extends BaseGraphBuilder implements ObjEntityListener,
Map<Entity, DefaultEdge> inheritanceEdges;
public ObjGraphBuilder() {
- inheritanceEdges = new HashMap<Entity, DefaultEdge>();
+ inheritanceEdges = new HashMap<>();
}
@Override
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
index d5dde14..fd22b74 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
@@ -18,16 +18,6 @@
****************************************************************/
package org.apache.cayenne.modeler.undo;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.swing.undo.CannotRedoException;
-import javax.swing.undo.CannotUndoException;
-
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.event.DataNodeEvent;
@@ -38,6 +28,7 @@ import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
@@ -50,7 +41,15 @@ import org.apache.cayenne.modeler.action.CreateProcedureAction;
import org.apache.cayenne.modeler.action.CreateQueryAction;
import org.apache.cayenne.modeler.action.CreateRelationshipAction;
import org.apache.cayenne.modeler.action.RemoveAction;
-import org.apache.cayenne.map.QueryDescriptor;
+
+import javax.swing.undo.CannotRedoException;
+import javax.swing.undo.CannotUndoException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
public class RemoveUndoableEdit extends CayenneUndoableEdit {
@@ -65,8 +64,8 @@ public class RemoveUndoableEdit extends CayenneUndoableEdit {
private Embeddable embeddable;
- private Map<DbEntity, List<DbRelationship>> dbRelationshipMap = new HashMap<DbEntity, List<DbRelationship>>();
- private Map<ObjEntity, List<ObjRelationship>> objRelationshipMap = new HashMap<ObjEntity, List<ObjRelationship>>();
+ private Map<DbEntity, List<DbRelationship>> dbRelationshipMap = new HashMap<>();
+ private Map<ObjEntity, List<ObjRelationship>> objRelationshipMap = new HashMap<>();
private static enum REMOVE_MODE {
OBJECT_ENTITY, DB_ENTITY, QUERY, PROCEDURE, MAP_FROM_NODE, MAP_FROM_DOMAIN, NODE, DOMAIN, EMBEDDABLE
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/EntityTreeModel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/EntityTreeModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/EntityTreeModel.java
index 6e2c6c1..59fdd28 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/EntityTreeModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/EntityTreeModel.java
@@ -19,6 +19,13 @@
package org.apache.cayenne.modeler.util;
+import org.apache.cayenne.map.Attribute;
+import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.Relationship;
+
+import javax.swing.event.TreeModelListener;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
@@ -26,14 +33,6 @@ import java.util.List;
import java.util.Map;
import java.util.Vector;
-import javax.swing.event.TreeModelListener;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreePath;
-
-import org.apache.cayenne.map.Attribute;
-import org.apache.cayenne.map.Entity;
-import org.apache.cayenne.map.Relationship;
-
/**
* Swing TreeModel for Entity attributes and relationships
*
@@ -50,7 +49,7 @@ public class EntityTreeModel implements TreeModel {
public EntityTreeModel(Entity root) {
this.root = root;
- sortedChildren = new HashMap<Object, Object[]>();
+ sortedChildren = new HashMap<>();
}
public Object getRoot() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneView.java
index 81e9d21..331a2e0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneView.java
@@ -18,13 +18,11 @@
****************************************************************/
package org.apache.cayenne.swing.components.textpane;
-import java.awt.Graphics;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import org.apache.cayenne.swing.components.textpane.style.SyntaxStyle;
+import org.apache.cayenne.swing.components.textpane.style.TextPaneStyleMap;
+import org.apache.cayenne.swing.components.textpane.style.TextPaneStyleTypes;
+import org.apache.cayenne.swing.components.textpane.syntax.SQLSyntaxConstants;
+import org.apache.cayenne.swing.components.textpane.syntax.SyntaxConstant;
import javax.swing.text.BadLocationException;
import javax.swing.text.Element;
@@ -33,12 +31,13 @@ import javax.swing.text.PlainView;
import javax.swing.text.Segment;
import javax.swing.text.StyledDocument;
import javax.swing.text.Utilities;
-
-import org.apache.cayenne.swing.components.textpane.style.TextPaneStyleMap;
-import org.apache.cayenne.swing.components.textpane.style.TextPaneStyleTypes;
-import org.apache.cayenne.swing.components.textpane.style.SyntaxStyle;
-import org.apache.cayenne.swing.components.textpane.syntax.SQLSyntaxConstants;
-import org.apache.cayenne.swing.components.textpane.syntax.SyntaxConstant;
+import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class TextPaneView extends PlainView {
@@ -50,8 +49,8 @@ public class TextPaneView extends PlainView {
private static HashMap<Pattern, SyntaxStyle> patternValue;
static {
- patternSyntaxStyle = new HashMap<Pattern, SyntaxStyle>();
- patternValue = new HashMap<Pattern, SyntaxStyle>();
+ patternSyntaxStyle = new HashMap<>();
+ patternValue = new HashMap<>();
}
public TextPaneView(Element elem, SyntaxConstant syntaxConstants) {
@@ -117,8 +116,8 @@ public class TextPaneView extends PlainView {
throws BadLocationException {
boolean lineComment = false;
- HashMap<Integer, Integer> comment = new HashMap<Integer, Integer>();
- HashMap<Integer, Integer> commentInLine = new HashMap<Integer, Integer>();
+ Map<Integer, Integer> comment = new HashMap<>();
+ Map<Integer, Integer> commentInLine = new HashMap<>();
StyledDocument doc = (StyledDocument) getDocument();
String text = doc.getText(p0, p1 - p0);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/078ae39f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleMap.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleMap.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleMap.java
index 891b91c..5c79eab 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleMap.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleMap.java
@@ -18,17 +18,16 @@
****************************************************************/
package org.apache.cayenne.swing.components.textpane.style;
-import java.awt.Color;
-import java.awt.Font;
-import java.util.HashMap;
-
import org.apache.cayenne.swing.components.textpane.syntax.SQLSyntaxConstants;
+import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
public class TextPaneStyleMap {
- public HashMap<TextPaneStyleTypes, SyntaxStyle> syntaxStyleMap = new HashMap<TextPaneStyleTypes, SyntaxStyle>();
+ public Map<TextPaneStyleTypes, SyntaxStyle> syntaxStyleMap = new HashMap<>();
public TextPaneStyleMap() {
Font plainFont = SQLSyntaxConstants.DEFAULT_FONT;