makePaths(GliderRegionOfInterest.RegionSet reg
for (GliderRegionOfInterest region : regions.regions) {
Path p = new Path(region.getLocations(), altitude);
- var attrs = new BasicShapeAttributes();
+ BasicShapeAttributes attrs = new BasicShapeAttributes();
attrs.setOutlineMaterial(new Material(region.getColor()));
p.setAttributes(attrs);
p.setSurfacePath(true);
diff --git a/src/gov/nasa/worldwindx/applications/sar/SAR2.java b/src/gov/nasa/worldwindx/applications/sar/SAR2.java
index 12bedb563d..4e823a70a4 100644
--- a/src/gov/nasa/worldwindx/applications/sar/SAR2.java
+++ b/src/gov/nasa/worldwindx/applications/sar/SAR2.java
@@ -807,7 +807,7 @@ public void windowClosed(WindowEvent event)
newTrack.setText("New Track...");
newTrack.setMnemonic('N');
newTrack.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
newTrack.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -822,7 +822,7 @@ public void actionPerformed(ActionEvent e)
openTrackFile.setText("Open Track File...");
openTrackFile.setMnemonic('O');
openTrackFile.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
openTrackFile.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -837,7 +837,7 @@ public void actionPerformed(ActionEvent e)
openTrackURL.setText("Open Track URL...");
openTrackURL.setMnemonic('U');
openTrackURL.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_U,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
openTrackURL.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -853,7 +853,7 @@ public void actionPerformed(ActionEvent e)
removeTrack.setMnemonic('C');
removeTrack.setAccelerator(KeyStroke.getKeyStroke(
Configuration.isMacOS() ? KeyEvent.VK_W : KeyEvent.VK_F4,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
removeTrack.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -871,7 +871,7 @@ public void actionPerformed(ActionEvent e)
saveTrack.setText("Save Track");
saveTrack.setMnemonic('S');
saveTrack.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
saveTrack.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent event)
@@ -888,7 +888,7 @@ public void actionPerformed(ActionEvent event)
saveTrackAs.setText("Save Track As...");
saveTrackAs.setMnemonic('A');
saveTrackAs.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() + java.awt.event.InputEvent.SHIFT_DOWN_MASK));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() + java.awt.event.InputEvent.SHIFT_DOWN_MASK));
saveTrackAs.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent event)
@@ -904,7 +904,7 @@ public void actionPerformed(ActionEvent event)
screenShot.setIcon(null); // Make sure the menu items displays only text.
screenShot.setMnemonic('T');
screenShot.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Z,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
fileMenu.add(screenShot);
//--------
@@ -914,7 +914,7 @@ public void actionPerformed(ActionEvent event)
bulkDownload.setText("Bulk download...");
bulkDownload.setMnemonic('B');
bulkDownload.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_B,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
bulkDownload.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent event)
@@ -1004,7 +1004,7 @@ public void actionPerformed(ActionEvent event)
metersMenuItem.setText("Meters");
metersMenuItem.setMnemonic('M');
metersMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
metersMenuItem.setActionCommand(UNIT_METRIC);
metersMenuItem.addActionListener(new ActionListener()
{
@@ -1042,7 +1042,7 @@ public void actionPerformed(ActionEvent e)
angleDDMenuItem.setText("Angles DD");
angleDDMenuItem.setMnemonic('D');
angleDDMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
angleDDMenuItem.setActionCommand(Angle.ANGLE_FORMAT_DD);
angleDDMenuItem.addActionListener(new ActionListener()
{
@@ -1086,7 +1086,7 @@ public void actionPerformed(ActionEvent e)
newAnnotation.setText("New Annotation...");
newAnnotation.setMnemonic('N');
newAnnotation.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
newAnnotation.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -1101,7 +1101,7 @@ public void actionPerformed(ActionEvent e)
removeAnnotation.setText("Remove Annotation");
removeAnnotation.setMnemonic('R');
removeAnnotation.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() + java.awt.event.InputEvent.SHIFT_DOWN_MASK));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() + java.awt.event.InputEvent.SHIFT_DOWN_MASK));
removeAnnotation.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent event)
@@ -1157,7 +1157,7 @@ public void itemStateChanged(ItemEvent e)
sarHelp.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0));
else
sarHelp.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_HELP,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
sarHelp.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
diff --git a/src/gov/nasa/worldwindx/applications/sar/TrackController.java b/src/gov/nasa/worldwindx/applications/sar/TrackController.java
index ae4eded386..c0d2715404 100644
--- a/src/gov/nasa/worldwindx/applications/sar/TrackController.java
+++ b/src/gov/nasa/worldwindx/applications/sar/TrackController.java
@@ -196,7 +196,7 @@ private void createPathTrackRepresentation(SARTrack track) {
Path airPath = new Path(track);
airPath.setOffset(track.getOffset());
airPath.setPathType(AVKey.RHUMB_LINE);
- var attrs = new BasicShapeAttributes();
+ BasicShapeAttributes attrs = new BasicShapeAttributes();
attrs.setOutlineMaterial(new Material(track.getColor()));
airPath.setAttributes(attrs);
diff --git a/src/gov/nasa/worldwindx/applications/sar/ViewMenu.java b/src/gov/nasa/worldwindx/applications/sar/ViewMenu.java
index 230aecba01..907a9a4390 100644
--- a/src/gov/nasa/worldwindx/applications/sar/ViewMenu.java
+++ b/src/gov/nasa/worldwindx/applications/sar/ViewMenu.java
@@ -67,7 +67,7 @@ public void setWwd(WorldWindow wwdInstance)
// Terrain profile
JMenuItem mi = new JMenuItem("Terrain profile...");
mi.setMnemonic('T');
- mi.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ mi.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
mi.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent event)
@@ -80,7 +80,7 @@ public void actionPerformed(ActionEvent event)
// Cloud ceiling contour
mi = new JMenuItem("Cloud Contour...");
mi.setMnemonic('C');
- mi.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ mi.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
mi.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent event)
diff --git a/src/gov/nasa/worldwindx/applications/sar/render/PlaneModel.java b/src/gov/nasa/worldwindx/applications/sar/render/PlaneModel.java
index 2d9eb42a72..0f537ccb92 100644
--- a/src/gov/nasa/worldwindx/applications/sar/render/PlaneModel.java
+++ b/src/gov/nasa/worldwindx/applications/sar/render/PlaneModel.java
@@ -163,7 +163,7 @@ private void createRenderables(DrawContext dc) {
this.planeModel.setPathType(AVKey.LINEAR);
this.planeModel.setFollowTerrain(false);
this.planeModel.setNumSubsegments(1);
- var attrs = new BasicShapeAttributes();
+ BasicShapeAttributes attrs = new BasicShapeAttributes();
attrs.setOutlineMaterial(new Material(this.color));
this.planeModel.setAttributes(attrs);
diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/core/SimpleImporter.java b/src/gov/nasa/worldwindx/applications/worldwindow/core/SimpleImporter.java
index b99c59f59a..ca35dc2f7a 100644
--- a/src/gov/nasa/worldwindx/applications/worldwindow/core/SimpleImporter.java
+++ b/src/gov/nasa/worldwindx/applications/worldwindow/core/SimpleImporter.java
@@ -144,7 +144,7 @@ protected boolean isShapfile(Object source) {
}
protected void openShapefile(Object source) {
- var factory = new ShapefileLayerFactory();
+ ShapefileLayerFactory factory = new ShapefileLayerFactory();
Layer layer = (Layer) factory.createFromShapefileSource(source);
if (layer != null) {
layer.setName(formName(source, null));
diff --git a/src/gov/nasa/worldwindx/applications/worldwindow/features/MeasurementPanel.java b/src/gov/nasa/worldwindx/applications/worldwindow/features/MeasurementPanel.java
index f5c92840d2..a9119e52e4 100644
--- a/src/gov/nasa/worldwindx/applications/worldwindow/features/MeasurementPanel.java
+++ b/src/gov/nasa/worldwindx/applications/worldwindow/features/MeasurementPanel.java
@@ -215,7 +215,7 @@ private Renderable makeMeasureShape(String shapeType) {
Path line = new Path();
line.setPositions(new ArrayList<>());
line.setSurfacePath(true);
- var attrs = new BasicShapeAttributes();
+ BasicShapeAttributes attrs = new BasicShapeAttributes();
attrs.setOutlineWidth(shapeType.equals(FREEHAND) ? 2 : 4);
line.setAttributes(attrs);
return line;
diff --git a/src/gov/nasa/worldwindx/examples/AirspaceBuilder.java b/src/gov/nasa/worldwindx/examples/AirspaceBuilder.java
index 32dbb83776..c2da1f62cb 100644
--- a/src/gov/nasa/worldwindx/examples/AirspaceBuilder.java
+++ b/src/gov/nasa/worldwindx/examples/AirspaceBuilder.java
@@ -1323,7 +1323,7 @@ public static void makeMenuBar(JFrame frame, final AirspaceBuilderController con
{
JMenuItem item = new JMenuItem("Open...");
item.setAccelerator(KeyStroke.getKeyStroke(
- KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
item.setActionCommand(OPEN);
item.addActionListener(controller);
menu.add(item);
@@ -1335,7 +1335,7 @@ public static void makeMenuBar(JFrame frame, final AirspaceBuilderController con
item = new JMenuItem("Save...");
item.setAccelerator(KeyStroke.getKeyStroke(
- KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
item.setActionCommand(SAVE);
item.addActionListener(controller);
menu.add(item);
@@ -1379,7 +1379,7 @@ public static void makeMenuBar(JFrame frame, final AirspaceBuilderController con
{
JMenuItem item = new JMenuItem("Deselect");
item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
item.setActionCommand(CLEAR_SELECTION);
item.addActionListener(controller);
menu.add(item);
diff --git a/src/gov/nasa/worldwindx/examples/KeepingObjectsInView.java b/src/gov/nasa/worldwindx/examples/KeepingObjectsInView.java
index f6bab33ead..bfabb7095e 100644
--- a/src/gov/nasa/worldwindx/examples/KeepingObjectsInView.java
+++ b/src/gov/nasa/worldwindx/examples/KeepingObjectsInView.java
@@ -196,7 +196,7 @@ public static Iterable createObjectsToTrack() {
randLocation2 = randomLocation(sector);
Path path = new Path(Arrays.asList(randLocation1, randLocation2), 0d);
path.setSurfacePath(true);
- var attrs = new BasicShapeAttributes();
+ BasicShapeAttributes attrs = new BasicShapeAttributes();
attrs.setOutlineWidth(3);
attrs.setOutlineMaterial(new Material(Color.RED));
path.setAttributes(attrs);
diff --git a/src/gov/nasa/worldwindx/examples/LineBackground.java b/src/gov/nasa/worldwindx/examples/LineBackground.java
index bc0b070a4d..0459be0337 100644
--- a/src/gov/nasa/worldwindx/examples/LineBackground.java
+++ b/src/gov/nasa/worldwindx/examples/LineBackground.java
@@ -94,7 +94,7 @@ public AppFrame() {
path2.setSurfacePath(true);
path2.setPathType(AVKey.RHUMB_LINE);
float[] c = backgroundAttrs.getOutlineMaterial().getDiffuse().getColorComponents(new float[3]);
- var attrs = new BasicShapeAttributes(backgroundAttrs);
+ BasicShapeAttributes attrs = new BasicShapeAttributes(backgroundAttrs);
attrs.setOutlineMaterial(new Material(new Color(c[0], c[1], c[2], (float) backgroundAttrs.getOutlineOpacity())));
path2.setAttributes(attrs);
path2.makeClosed();
diff --git a/src/gov/nasa/worldwindx/examples/SurfaceImages.java b/src/gov/nasa/worldwindx/examples/SurfaceImages.java
index 7d6ff88c16..c6057f3717 100644
--- a/src/gov/nasa/worldwindx/examples/SurfaceImages.java
+++ b/src/gov/nasa/worldwindx/examples/SurfaceImages.java
@@ -75,7 +75,7 @@ public AppFrame() {
Path boundary = new Path(si1.getCorners(), 0);
boundary.setSurfacePath(true);
boundary.setPathType(AVKey.RHUMB_LINE);
- var attrs = new BasicShapeAttributes();
+ BasicShapeAttributes attrs = new BasicShapeAttributes();
attrs.setOutlineMaterial(new Material(new Color(0, 255, 0)));
boundary.setAttributes(attrs);
boundary.makeClosed();
diff --git a/src/gov/nasa/worldwindx/examples/WorldWindDiagnostics.java b/src/gov/nasa/worldwindx/examples/WorldWindDiagnostics.java
index bafb38e916..3438656c86 100644
--- a/src/gov/nasa/worldwindx/examples/WorldWindDiagnostics.java
+++ b/src/gov/nasa/worldwindx/examples/WorldWindDiagnostics.java
@@ -134,9 +134,9 @@ public void init(GLAutoDrawable glAutoDrawable) {
sb.append("\nJOGL Values\n");
String pkgName = "com.jogamp.opengl";
try {
- getClass().getClassLoader().loadClass(pkgName + ".GL");
-
- Package p = getClass().getClassLoader().getDefinedPackage(pkgName);
+ Class clase = getClass().getClassLoader().loadClass(pkgName + ".GL");
+
+ Package p = clase.getPackage();//getClass().getClassLoader().getDefinedPackage(pkgName);
if (p == null) {
sb.append("WARNING: Package.getPackage(" + pkgName + ") is null\n");
} else {
diff --git a/src/gov/nasa/worldwindx/examples/shapebuilder/ExtrudedPolygonBuilder.java b/src/gov/nasa/worldwindx/examples/shapebuilder/ExtrudedPolygonBuilder.java
index 2ff2494b27..218c4669d2 100644
--- a/src/gov/nasa/worldwindx/examples/shapebuilder/ExtrudedPolygonBuilder.java
+++ b/src/gov/nasa/worldwindx/examples/shapebuilder/ExtrudedPolygonBuilder.java
@@ -942,7 +942,7 @@ public static void makeMenuBar(JFrame frame, final PolygonBuilderController cont
{
JMenuItem item = new JMenuItem("Deselect");
item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
item.setActionCommand(CLEAR_SELECTION);
item.addActionListener(controller);
menu.add(item);
diff --git a/src/gov/nasa/worldwindx/examples/shapebuilder/RigidShapeBuilder.java b/src/gov/nasa/worldwindx/examples/shapebuilder/RigidShapeBuilder.java
index 63b27956f1..8bec948d05 100644
--- a/src/gov/nasa/worldwindx/examples/shapebuilder/RigidShapeBuilder.java
+++ b/src/gov/nasa/worldwindx/examples/shapebuilder/RigidShapeBuilder.java
@@ -1863,14 +1863,14 @@ public static void makeMenuBar(JFrame frame, final AbstractShapeBuilderControlle
{
JMenuItem item = new JMenuItem("Open...");
item.setAccelerator(KeyStroke.getKeyStroke(
- KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
item.setActionCommand(OPEN);
item.addActionListener(controller);
menu.add(item);
item = new JMenuItem("Save...");
item.setAccelerator(KeyStroke.getKeyStroke(
- KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
item.setActionCommand(SAVE);
item.addActionListener(controller);
menu.add(item);
@@ -1900,7 +1900,7 @@ public void actionPerformed(ActionEvent e)
{
JMenuItem item = new JMenuItem(mode.getMode());
item.setAccelerator(KeyStroke.getKeyStroke(mode.getShortcut(),
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -1936,7 +1936,7 @@ public void actionPerformed(ActionEvent e)
{
JMenuItem item = new JMenuItem("Deselect");
item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+ Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
item.setActionCommand(CLEAR_SELECTION);
item.addActionListener(controller);
menu.add(item);
diff --git a/src/overview.html b/src/overview.html
index faba690f87..5babc9c1cd 100644
--- a/src/overview.html
+++ b/src/overview.html
@@ -56,7 +56,7 @@ Data Retrieval
WorldWind works with enormous quantities of data and information, all of which exist primarily on remote data
servers. Retrieval and local caching of that data is therefore a primary feature of WorldWind. The classes that
implement retrieval are {@link gov.nasa.worldwind.retrieve.Retriever} and {@link
- gov.nasa.worldwind.retrieve.RetrievalService}.
+ gov.nasa.worldwind.retrieve.RetrievalService}.
{@link gov.nasa.worldwind.retrieve.Retriever} encapsulates a single network retrieval request. It is an interface.
@@ -79,7 +79,7 @@
Data Retrieval
for instance, can convert non-DDS formats to DDS, or simply store the data as-is in the file cache. {@link
gov.nasa.worldwind.terrain.BasicElevationModel} just persists the raw data. The post processor runs in the same
thread as the retriever, which is neither the event-dispatching (UI) thread nor the rendering thread, but the one
- created by the retrieval service for that retriever.
+ created by the retrieval service for that retriever.
Data that has been previously retrieved or is otherwise local (on disk) is brought into memory in a thread separate
@@ -97,7 +97,7 @@
Data Retrieval
java.lang.Runnable} to determine in a separate thread where the data must be drawn from, disk or network. If it's on
the disk then the task can simply read it and cache it right away. If it's remote then the task creates a
Retriever and requests retrieval. Later, after retrieval has placed the data on disk, the situation will be
- the local case and data can be loaded into memory within the Runnable.
+ the local case and data can be loaded into memory within the Runnable.
Memory Cache
@@ -156,7 +156,7 @@ Picking and Selection
receives the full list of picked items, with the truly visible ones marked as such.
WorldWind provides utility classes to make it simple for layers to participate in this picking scheme. See {@link
- gov.nasa.worldwind.pick.PickSupport}
+ gov.nasa.worldwind.pick.PickSupport}.
Use of Proxies
diff --git a/worldwind-2.4.0.jar b/worldwind-2.4.0.jar
new file mode 100644
index 0000000000..8bee44726c
Binary files /dev/null and b/worldwind-2.4.0.jar differ
diff --git a/worldwindx-2.4.0.jar b/worldwindx-2.4.0.jar
new file mode 100644
index 0000000000..6b89805d57
Binary files /dev/null and b/worldwindx-2.4.0.jar differ