Revision: 5826
http://sourceforge.net/p/jump-pilot/code/5826
Author: michaudm
Date: 2018-06-03 10:47:03 +0000 (Sun, 03 Jun 2018)
Log Message:
-----------
Clean code : remove deprecated methods, use foreach loops, generics...
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/imagery/ecw/ECWImageFactory.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/SchemaPanel.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/addremove/DefaultAddRemoveList.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/test/RandomTrianglesPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/test/TestColorThemingPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/style/ColorScheme.java
core/trunk/src/org/openjump/core/ui/plugin/window/SynchronizationPlugIn.java
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/imagery/ecw/ECWImageFactory.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/imagery/ecw/ECWImageFactory.java
2018-06-03 09:59:11 UTC (rev 5825)
+++
core/trunk/src/com/vividsolutions/jump/workbench/imagery/ecw/ECWImageFactory.java
2018-06-03 10:47:03 UTC (rev 5826)
@@ -63,7 +63,6 @@
}
public ReferencedImage createImage(String location) throws Exception {
- // if(true)throw new Exception("foobar");
URI uri = new URI(location);
if (CompressedFile.isArchive(uri) || CompressedFile.isCompressed(uri))
@@ -77,7 +76,7 @@
throw new ECWLoadException(
I18N.getMessage(
"com.vividsolutions.jump.workbench.imagery.ecw.path-contains-nonansi-chars",
- new Object[] { hint }));
+ hint));
}
return new ECWImage(filepath);
@@ -100,10 +99,10 @@
if (available != null)
return available;
- available = new Boolean( _isAvailable(context) );
+ available = _isAvailable(context);
if (!available)
- context.getWorkbench().getFrame().log("ECW/JP2 SDK loader will be
unavailable.");
-
+ Logger.info("ECW/JP2 SDK loader will be unavailable.");
+
return available;
}
Modified: core/trunk/src/com/vividsolutions/jump/workbench/ui/SchemaPanel.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/SchemaPanel.java
2018-06-03 09:59:11 UTC (rev 5825)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/SchemaPanel.java
2018-06-03 10:47:03 UTC (rev 5826)
@@ -519,7 +519,7 @@
private void addPopupMenuItem(PlugIn plugIn, boolean checkBox, Icon icon,
EnableCheck enableCheck, WorkbenchContext context) {
final FeatureInstaller installer = new FeatureInstaller(context);
- installer.addPopupMenuItem(popupMenu, addCleanUp(plugIn),
+ installer.addPopupMenuPlugin(popupMenu, addCleanUp(plugIn),
plugIn.getName(), checkBox, icon, enableCheck);
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/addremove/DefaultAddRemoveList.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/addremove/DefaultAddRemoveList.java
2018-06-03 09:59:11 UTC (rev 5825)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/addremove/DefaultAddRemoveList.java
2018-06-03 10:47:03 UTC (rev 5826)
@@ -33,19 +33,15 @@
package com.vividsolutions.jump.workbench.ui.addremove;
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.event.MouseListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import javax.swing.DefaultListModel;
import javax.swing.JList;
import javax.swing.JPanel;
-import javax.swing.border.Border;
-import javax.swing.border.EtchedBorder;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
@@ -55,11 +51,11 @@
public class DefaultAddRemoveList extends JPanel implements AddRemoveList {
+
private BorderLayout borderLayout1 = new BorderLayout();
private JList list = new JList();
private DefaultAddRemoveListModel model;
private InputChangedFirer inputChangedFirer = new InputChangedFirer();
- private Border border1;
public DefaultAddRemoveList() {
this(new DefaultListModel());
@@ -87,10 +83,9 @@
}
public void setSelectedItems(Collection items) {
- ArrayList indicesToSelect = new ArrayList();
+ List<Integer> indicesToSelect = new ArrayList<>();
- for (Iterator i = items.iterator(); i.hasNext();) {
- Object item = (Object) i.next();
+ for (Object item : items) {
int index = getModel().getItems().indexOf(item);
if (index == -1) {
@@ -97,14 +92,14 @@
continue;
}
- indicesToSelect.add(new Integer(index));
+ indicesToSelect.add(index);
}
int[] indexArray = new int[indicesToSelect.size()];
for (int i = 0; i < indicesToSelect.size(); i++) {
- Integer index = (Integer) indicesToSelect.get(i);
- indexArray[i] = index.intValue();
+ Integer index = indicesToSelect.get(i);
+ indexArray[i] = index;
}
list.setSelectedIndices(indexArray);
@@ -123,12 +118,10 @@
}
public List getSelectedItems() {
- return Arrays.asList(list.getSelectedValues());
+ return list.getSelectedValuesList();
}
void jbInit() throws Exception {
- border1 = new EtchedBorder(EtchedBorder.RAISED, new Color(0, 0, 51),
- new Color(0, 0, 25));
this.setLayout(borderLayout1);
this.add(list, BorderLayout.CENTER);
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/test/RandomTrianglesPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/test/RandomTrianglesPlugIn.java
2018-06-03 09:59:11 UTC (rev 5825)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/test/RandomTrianglesPlugIn.java
2018-06-03 10:47:03 UTC (rev 5826)
@@ -57,12 +57,11 @@
import com.vividsolutions.jump.workbench.ui.MenuNames;
public class RandomTrianglesPlugIn extends AbstractPlugIn {
- private static int dummyLayerCount = 0;
+
private GeometryFactory geometryFactory = new GeometryFactory();
private WKTReader wktReader = new WKTReader(geometryFactory);
private List cities =
Arrays.asList(
- new String[] {
"Alabama",
"Alaska",
"Arizona",
@@ -112,7 +111,7 @@
"Washington",
"West Virginia",
"Wisconsin",
- "Wyoming" });
+ "Wyoming");
public RandomTrianglesPlugIn() {
}
@@ -153,7 +152,6 @@
private void generateLayer(PlugInContext context, int size)
throws ParseException, IOException {
- dummyLayerCount++;
FeatureSchema featureSchema = new FeatureSchema();
featureSchema.addAttribute("Geometry", AttributeType.GEOMETRY);
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/test/TestColorThemingPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/test/TestColorThemingPlugIn.java
2018-06-03 09:59:11 UTC (rev 5825)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/test/TestColorThemingPlugIn.java
2018-06-03 10:47:03 UTC (rev 5826)
@@ -6,7 +6,6 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -17,12 +16,11 @@
import com.vividsolutions.jump.workbench.ui.renderer.style.BasicStyle;
import com.vividsolutions.jump.workbench.ui.renderer.style.ColorScheme;
import com.vividsolutions.jump.workbench.ui.renderer.style.ColorThemingStyle;
-import com.vividsolutions.jump.workbench.ui.renderer.style.Style;
public class TestColorThemingPlugIn extends AbstractPlugIn {
public void initialize(PlugInContext context) throws Exception {
- context.getFeatureInstaller().addMainMenuItem(
+ context.getFeatureInstaller().addMainMenuPlugin(
this,
new String[] { "Tools", "Test" },
getName(),
@@ -32,9 +30,8 @@
randomTrianglesPlugIn.setCities(cities);
}
- private List cities =
+ private List<String> cities =
Arrays.asList(
- new String[] {
"Alabama",
"Alaska",
"Arizona",
@@ -45,18 +42,17 @@
"Delaware",
"Florida",
"Georgia",
- "Hawaii" });
+ "Hawaii");
private RandomTrianglesPlugIn randomTrianglesPlugIn =
new RandomTrianglesPlugIn();
public boolean execute(PlugInContext context) throws Exception {
- ArrayList names = new ArrayList();
+ ArrayList<String> names = new ArrayList<>();
names.addAll(ColorScheme.discreteColorSchemeNames());
names.addAll(ColorScheme.rangeColorSchemeNames());
Collections.reverse(names);
- for (Iterator i = names.iterator(); i.hasNext();) {
- String colorScheme = (String) i.next();
+ for (String colorScheme : names) {
execute(context, colorScheme);
}
return true;
@@ -68,9 +64,8 @@
Layer layer = context.getLayerManager().getLayer("Random
Triangles");
ColorScheme colorScheme = ColorScheme.create(colorSchemeName);
layer.setName("(" + colorScheme.getColors().size() + ") " +
colorSchemeName);
- Map<Object,BasicStyle> attributeToStyleMap = new
HashMap<Object,BasicStyle>();
- for (Iterator i = cities.iterator(); i.hasNext(); ) {
- String city = (String) i.next();
+ Map<Object,BasicStyle> attributeToStyleMap = new HashMap<>();
+ for (String city : cities) {
attributeToStyleMap.put(city, new
BasicStyle(colorScheme.next()));
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/style/ColorScheme.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/style/ColorScheme.java
2018-06-03 09:59:11 UTC (rev 5825)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/style/ColorScheme.java
2018-06-03 10:47:03 UTC (rev 5826)
@@ -70,17 +70,14 @@
private static void load() {
try {
- rangeColorSchemeNames = new ArrayList<String>();
- discreteColorSchemeNames = new ArrayList<String>();
- nameToColorsMap = new CollectionMap();
- InputStream inputStream =
- ColorScheme.class.getResourceAsStream("ColorScheme.txt");
- try {
+ rangeColorSchemeNames = new ArrayList<>();
+ discreteColorSchemeNames = new ArrayList<>();
+ nameToColorsMap = new CollectionMap<>();
+ try (InputStream inputStream =
+
ColorScheme.class.getResourceAsStream("ColorScheme.txt")) {
for (Object line : FileUtil.getContents(inputStream)) {
add((String)line);
}
- } finally {
- inputStream.close();
}
} catch (IOException e) {
Assert.shouldNeverReachHere(e.toString());
@@ -99,7 +96,7 @@
}
}
- private static CollectionMap nameToColorsMap() {
+ private static CollectionMap<String,Color> nameToColorsMap() {
if (nameToColorsMap == null) {
load();
}
@@ -106,9 +103,9 @@
return nameToColorsMap;
}
- private static CollectionMap nameToColorsMap;
+ private static CollectionMap<String,Color> nameToColorsMap;
- public static Collection rangeColorSchemeNames() {
+ public static Collection<String> rangeColorSchemeNames() {
if (rangeColorSchemeNames == null) {
load();
}
@@ -115,7 +112,7 @@
return Collections.unmodifiableList(rangeColorSchemeNames);
}
- public static Collection discreteColorSchemeNames() {
+ public static Collection<String> discreteColorSchemeNames() {
if (discreteColorSchemeNames == null) {
load();
}
@@ -124,9 +121,9 @@
final private String name;
- public ColorScheme(String name, Collection colors) {
+ public ColorScheme(String name, Collection<Color> colors) {
this.name = name;
- this.colors = new ArrayList<Color>(colors);
+ this.colors = new ArrayList<>(colors);
}
private int lastColorReturned = -1;
Modified:
core/trunk/src/org/openjump/core/ui/plugin/window/SynchronizationPlugIn.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/window/SynchronizationPlugIn.java
2018-06-03 09:59:11 UTC (rev 5825)
+++
core/trunk/src/org/openjump/core/ui/plugin/window/SynchronizationPlugIn.java
2018-06-03 10:47:03 UTC (rev 5826)
@@ -288,13 +288,13 @@
h / modelEnvelope.getHeight());
}
- double xCenteringOffset = ((w / scale) -
modelEnvelope
- .getWidth()) / 2.0;
- double yCenteringOffset = ((h / scale) -
modelEnvelope
- .getHeight()) / 2.0;
- Point2D.Double viewOriginAsPerceivedByModel = new
Point2D.Double(
- modelEnvelope.getMinX() - xCenteringOffset,
- modelEnvelope.getMinY() -
yCenteringOffset);
+ //double xCenteringOffset = ((w / scale) -
modelEnvelope
+ // .getWidth()) / 2.0;
+ //double yCenteringOffset = ((h / scale) -
modelEnvelope
+ // .getHeight()) / 2.0;
+ //Point2D.Double viewOriginAsPerceivedByModel =
new Point2D.Double(
+ // modelEnvelope.getMinX() -
xCenteringOffset,
+ // modelEnvelope.getMinY() -
yCenteringOffset);
viewport.initialize(scale,
viewport.getOriginInModelCoordinates());
viewport.update();
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
