Revision: 4876
http://sourceforge.net/p/jump-pilot/code/4876
Author: michaudm
Date: 2016-03-28 16:32:20 +0000 (Mon, 28 Mar 2016)
Log Message:
-----------
Deprecate OrderedMap, use LinkedHashMap or TreeMap instead
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/util/OrderedMap.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/InfoModel.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/RemoveSelectedCategoriesPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/RenderingManager.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/toolbox/ToolboxStateManager.java
Modified: core/trunk/src/com/vividsolutions/jump/util/OrderedMap.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/util/OrderedMap.java 2016-03-28
16:06:14 UTC (rev 4875)
+++ core/trunk/src/com/vividsolutions/jump/util/OrderedMap.java 2016-03-28
16:32:20 UTC (rev 4876)
@@ -38,7 +38,10 @@
/**
* A Map that preserves the order of its keys.
+ * @deprecated use LinkedHashMap to have predictable order and TreeMap
+ * to have a sorted map.
*/
+@Deprecated
public class OrderedMap<U,V> implements Map<U,V> {
private Map<U,V> map;
Modified: core/trunk/src/com/vividsolutions/jump/workbench/ui/InfoModel.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/InfoModel.java
2016-03-28 16:06:14 UTC (rev 4875)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/InfoModel.java
2016-03-28 16:32:20 UTC (rev 4876)
@@ -33,14 +33,10 @@
package com.vividsolutions.jump.workbench.ui;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
-import com.vividsolutions.jump.util.OrderedMap;
import com.vividsolutions.jump.workbench.model.Layer;
+import com.vividsolutions.jump.workbench.model.Layerable;
public class InfoModel {
@@ -65,7 +61,7 @@
//[Jon Aquino]
}
- private OrderedMap layerToTableModelMap = new OrderedMap();
+ private Map<Layerable,LayerTableModel> layerToTableModelMap = new
LinkedHashMap<>();
private ArrayList listeners = new ArrayList();
public InfoModel() {
@@ -119,8 +115,8 @@
return (LayerTableModel) layerToTableModelMap.get(layer);
}
- public List getLayers() {
- return Collections.unmodifiableList(layerToTableModelMap.keyList());
+ public List<Layer> getLayers() {
+ return Collections.unmodifiableList(new
ArrayList(layerToTableModelMap.keySet()));
}
public void addListener(InfoModelListener listener) {
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/RemoveSelectedCategoriesPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/RemoveSelectedCategoriesPlugIn.java
2016-03-28 16:06:14 UTC (rev 4875)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/RemoveSelectedCategoriesPlugIn.java
2016-03-28 16:32:20 UTC (rev 4876)
@@ -32,19 +32,13 @@
package com.vividsolutions.jump.workbench.ui.plugin;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
import javax.swing.Icon;
import javax.swing.JComponent;
import com.vividsolutions.jts.util.Assert;
import com.vividsolutions.jump.I18N;
-import com.vividsolutions.jump.util.OrderedMap;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.Category;
import com.vividsolutions.jump.workbench.model.LayerManager;
@@ -94,14 +88,11 @@
return true;
}
- private List toOrderedCategories(Collection unorderedCategories) {
- ArrayList orderedCategories = new ArrayList(unorderedCategories);
+ private List<Category> toOrderedCategories(Collection<Category>
unorderedCategories) {
+ ArrayList<Category> orderedCategories = new
ArrayList(unorderedCategories);
Collections.sort(orderedCategories,
- new Comparator() {
- public int compare(Object o1, Object o2) {
- Category c1 = (Category) o1;
- Category c2 = (Category) o2;
-
+ new Comparator<Category>() {
+ public int compare(Category c1, Category c2) {
return new
Integer(c1.getLayerManager().indexOf(c1)).compareTo(new Integer(
c2.getLayerManager().indexOf(c2)));
}
@@ -110,11 +101,11 @@
return orderedCategories;
}
- private OrderedMap toCategorySpecToLayerablesMap(
- List selectedCategoriesInOrder) {
+ private Map<CategorySpec,List<Layerable>> toCategorySpecToLayerablesMap(
+ List<Category> selectedCategoriesInOrder) {
//Need OrderedMap so that categories get re-inserted in the correct
order.
//[Jon Aquino]
- OrderedMap map = new OrderedMap();
+ Map<CategorySpec,List<Layerable>> map = new LinkedHashMap<>();
for (Iterator i = selectedCategoriesInOrder.iterator(); i.hasNext();) {
Category category = (Category) i.next();
@@ -129,12 +120,12 @@
return map;
}
- private void execute(final OrderedMap originalCategorySpecToLayerablesMap,
+ private void execute(final Map originalCategorySpecToLayerablesMap,
final Category newCategory, final PlugInContext context)
throws Exception {
execute(new UndoableCommand(getName()) {
public void execute() {
- for (Iterator i =
originalCategorySpecToLayerablesMap.keyList()
+ for (Iterator i =
originalCategorySpecToLayerablesMap.keySet()
.iterator();
i.hasNext();) {
final CategorySpec originalCategorySpec =
(CategorySpec) i.next();
@@ -153,7 +144,7 @@
}
public void unexecute() {
- for (Iterator i =
originalCategorySpecToLayerablesMap.keyList()
+ for (Iterator i =
originalCategorySpecToLayerablesMap.keySet()
.iterator();
i.hasNext();) {
final CategorySpec originalCategorySpec =
(CategorySpec) i.next();
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/RenderingManager.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/RenderingManager.java
2016-03-28 16:06:14 UTC (rev 4875)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/RenderingManager.java
2016-03-28 16:32:20 UTC (rev 4876)
@@ -32,7 +32,6 @@
package com.vividsolutions.jump.workbench.ui.renderer;
-import com.vividsolutions.jump.util.OrderedMap;
import com.vividsolutions.jump.workbench.model.Layerable;
import com.vividsolutions.jump.workbench.ui.GUIUtil;
import com.vividsolutions.jump.workbench.ui.LayerViewPanel;
@@ -75,11 +74,11 @@
public static final String USE_MULTI_RENDERING_THREAD_QUEUE_KEY =
RenderingManager.class.getName()
+ " - USE MULTI RENDERING THREAD QUEUE";
- private Map contentIDToRendererMap = new OrderedMap();
+ private Map<Object,Renderer> contentIDToRendererMap = new LinkedHashMap<>();
- private OrderedMap contentIDToLowRendererFactoryMap = new OrderedMap();
+ private Map<Object,Renderer.Factory> contentIDToLowRendererFactoryMap = new
LinkedHashMap<>();
- private OrderedMap contentIDToHighRendererFactoryMap = new OrderedMap();
+ private Map<Object,Renderer.Factory> contentIDToHighRendererFactoryMap = new
LinkedHashMap<>();
/**
* There's no performance advantage to rendering dozens of non-WMS or
@@ -204,15 +203,15 @@
}
}
- protected List contentIDs() {
- ArrayList contentIDs = new ArrayList();
- contentIDs.addAll(contentIDToLowRendererFactoryMap.keyList());
+ protected List<Object> contentIDs() {
+ List<Object> contentIDs = new ArrayList<>();
+ contentIDs.addAll(contentIDToLowRendererFactoryMap.keySet());
for (Iterator i =
panel.getLayerManager().reverseIterator(Layerable.class); i.hasNext();) {
Layerable layerable = (Layerable)i.next();
contentIDs.add(layerable);
}
- contentIDs.addAll(contentIDToHighRendererFactoryMap.keyList());
+ contentIDs.addAll(contentIDToHighRendererFactoryMap.keySet());
return contentIDs;
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/toolbox/ToolboxStateManager.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/toolbox/ToolboxStateManager.java
2016-03-28 16:06:14 UTC (rev 4875)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/toolbox/ToolboxStateManager.java
2016-03-28 16:32:20 UTC (rev 4876)
@@ -4,10 +4,7 @@
import java.awt.Container;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
+import java.util.*;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
@@ -20,7 +17,6 @@
import com.vividsolutions.jump.util.Blackboard;
import com.vividsolutions.jump.util.Block;
import com.vividsolutions.jump.util.LangUtil;
-import com.vividsolutions.jump.util.OrderedMap;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.LayerManager;
import com.vividsolutions.jump.workbench.ui.GUIUtil;
@@ -42,9 +38,11 @@
* JToggleButton (including JCheckBox), JComboBox.
*/
public class ToolboxStateManager {
+
private static int keyIndex = 0;
- private OrderedMap componentClassToStrategyMap = new OrderedMap() {
+ private Map<Class<?>,Strategy> componentClassToStrategyMap = new
LinkedHashMap<Class<?>,Strategy>() {
+
{
put(JTextComponent.class,
new Strategy() {
@@ -171,7 +169,7 @@
if (null != SwingUtilities.getAncestorOfClass(WorkbenchToolBar.class,
component)) {
return this;
}
- for (Iterator i = componentClassToStrategyMap.keyList().iterator();
+ for (Iterator i = componentClassToStrategyMap.keySet().iterator();
i.hasNext();) {
Class componentClass = (Class) i.next();
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
