8000 Formatting · NASAWorldWind/WorldWindJava@c35aec4 · GitHub
[go: up one dir, main page]
Skip to content

Commit c35aec4

Browse files
markpet49markpet49
committed
Formatting
1 parent 515d742 commit c35aec4

File tree

1 file changed

+65
-59
lines changed

1 file changed

+65
-59
lines changed

‎src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java

Lines changed: 65 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
* Copyright 2006-2009, 2017, 2020 United States Government, as represented by the
33
* Administrator of the National Aeronautics and Space Administration.
44
* All rights reserved.
5-
*
5+
*
66
* The NASA World Wind Java (WWJ) platform is licensed under the Apache License,
77
* Version 2.0 (the "License"); you may not use this file except in compliance
88
* with the License. You may obtain a copy of the License at
99
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
10+
*
1111
* Unless required by applicable law or agreed to in writing, software distributed
1212
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
1313
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
1414
* specific language governing permissions and limitations under the License.
15-
*
15+
*
1616
* NASA World Wind Java (WWJ) also contains the following 3rd party Open Source
1717
* software:
18-
*
18+
*
1919
* Jackson Parser – Licensed under Apache 2.0
2020
* GDAL – Licensed under MIT
2121
* JOGL – Licensed under Berkeley Software Distribution (BSD)
2222
* Gluegen – Licensed under Berkeley Software Distribution (BSD)
23-
*
23+
*
2424
* A complete listing of 3rd Party software notices and licenses included in
2525
* NASA World Wind Java (WWJ) can be found in the WorldWindJava-v2.2 3rd-party
2626
* notices and licenses PDF found in code directory.
@@ -224,9 +224,9 @@ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device
224224
}
225225

226226
@Override
227-
public void propertyChange(PropertyChangeEvent evt)
227+
public void propertyChange(PropertyChangeEvent evt)
228228
{
229-
if(this.wwd == evt.getSource())
229+
if (this.wwd == evt.getSource())
230230
this.firePropertyChange(evt);
231231

232232
//noinspection StringEquality
@@ -235,7 +235,7 @@ public void propertyChange(PropertyChangeEvent evt)
235235
}
236236

237237
@Override
238-
public void shutdown()
238+
public void shutdown()
239239
{
240240
WorldWind.removePropertyChangeListener(WorldWind.SHUTDOWN_EVENT, this);
241241
this.wwd.shutdown();
@@ -266,13 +266,13 @@ protected void createDefaultInputHandler()
266266
}
267267

268268
@Override
269-
public InputHandler getInputHandler()
269+
public InputHandler getInputHandler()
270270
{
271271
return this.wwd.getInputHandler();
272272
}
273273

274274
@Override
275-
public void setInputHandler(InputHandler inputHandler)
275+
public void setInputHandler(InputHandler inputHandler)
276276
{
277277
if (this.wwd.getInputHandler() != null)
278278
this.wwd.getInputHandler().setEventSource(null); // remove this window as a source of events
@@ -283,181 +283,181 @@ public void setInputHandler(InputHandler inputHandler)
283283
}
284284

285285
@Override
286-
public SceneController getSceneController()
286+
public SceneController getSceneController()
287287
{
288288
return this.wwd.getSceneController();
289289
}
290290

291291
@Override
292-
public void setSceneController(SceneController sceneController)
292+
public void setSceneController(SceneController sceneController)
293293
{
294294
this.wwd.setSceneController(sceneController);
295295
}
296296

297297
@Override
298-
public GpuResourceCache getGpuResourceCache()
298+
public GpuResourceCache getGpuResourceCache()
299299
{
300300
return this.wwd.getGpuResourceCache();
301301
}
302302

303303
@Override
304-
public void redraw()
304+
public void redraw()
305305
{
306306
this.repaint();
307307
}
308308

309309
@Override
310-
public void redrawNow()
310+
public void redrawNow()
311311
{
312312
this.wwd.redrawNow();
313313
}
314314

315315
@Override
316-
public void setModel(Model model)
316+
public void setModel(Model model)
317317
{
318318
// null models are permissible
319319
this.wwd.setModel(model);
320320
}
321321

322322
@Override
323-
public Model getModel()
323+
public Model getModel()
324324
{
325325
return this.wwd.getModel();
326326
}
327 F438 327

328328
@Override
329-
public void setView(View view)
329+
public void setView(View view)
330330
{
331331
// null views are permissible
332332
if (view != null)
333333
this.wwd.setView(view);
334334
}
335335

336336
@Override
337-
public View getView()
337+
public View getView()
338338
{
339339
return this.wwd.getView();
340340
}
341341

342342
@Override
343-
public void setModelAndView(Model model, View view)
343+
public void setModelAndView(Model model, View view)
344344
{ // null models/views are permissible
345345
this.setModel(model);
346346
this.setView(view);
347347
}
348348

349349
@Override
350-
public void addRenderingListener(RenderingListener listener)
350+
public void addRenderingListener(RenderingListener listener)
351351
{
352352
this.wwd.addRenderingListener(listener);
353353
}
354354

355355
@Override
356-
public void removeRenderingListener(RenderingListener listener)
356+
public void removeRenderingListener(RenderingListener listener)
357357
{
358358
this.wwd.removeRenderingListener(listener);
359359
}
360360

361361
@Override
362-
public void addSelectListener(SelectListener listener)
362+
public void addSelectListener(SelectListener listener)
363363
{
364364
this.wwd.getInputHandler().addSelectListener(listener);
365365
this.wwd.addSelectListener(listener);
366366< 10000 div class="diff-text-inner"> }
367367

368368
@Override
369-
public void removeSelectListener(SelectListener listener)
369+
public void removeSelectListener(SelectListener listener)
370370
{
371371
this.wwd.getInputHandler().removeSelectListener(listener);
372372
this.wwd.removeSelectListener(listener);
373373
}
374374

375375
@Override
376-
public void addPositionListener(PositionListener listener)
376+
public void addPositionListener(PositionListener listener)
377377
{
378378
this.wwd.addPositionListener(listener);
379379
}
380380

381381
@Override
382-
public void removePositionListener(PositionListener listener)
382+
public void removePositionListener(PositionListener listener)
383383
{
384384
this.wwd.removePositionListener(listener);
385385
}
386386

387387
@Override
388-
public void addRenderingExceptionListener(RenderingExceptionListener listener)
388+
public void addRenderingExceptionListener(RenderingExceptionListener listener)
389389
{
390390
this.wwd.addRenderingExceptionListener(listener);
391391
}
392392

393393
@Override
394-
public void removeRenderingExceptionListener(RenderingExceptionListener listener)
394+
public void removeRenderingExceptionListener(RenderingExceptionListener listener)
395395
{
396396
this.wwd.removeRenderingExceptionListener(listener);
397397
}
398398

399399
@Override
400-
public Position getCurrentPosition()
400+
public Position getCurrentPosition()
401401
{
402402
return this.wwd.getCurrentPosition();
403403
}
404404

405405
@Override
406-
public PickedObjectList getObjectsAtCurrentPosition()
406+
public PickedObjectList getObjectsAtCurrentPosition()
407407
{
408408
return this.wwd.getSceneController() != null ? this.wwd.getSceneController().getPickedObjectList() : null;
409409
}
410410

411411
@Override
412-
public PickedObjectList getObjectsInSelectionBox()
412+
public PickedObjectList getObjectsInSelectionBox()
413413
{
414414
return this.wwd.getSceneController() != null ? this.wwd.getSceneController().getObjectsInPickRectangle() : null;
415415
}
416416

417417
@Override
418-
public Object setValue(String key, Object value)
418+
public Object setValue(String key, Object value)
419419
{
420420
return this.wwd.setValue(key, value);
421421
}
422422

423423
@Override
424-
public AVList setValues(AVList avList)
424+
public AVList setValues(AVList avList)
425425
{
426426
return this.wwd.setValues(avList);
427427
}
428428

429429
@Override
430-
public Object getValue(String key)
430+
public Object getValue(String key)
431431
{
432432
return this.wwd.getValue(key);
433433
}
434434

435435
@Override
436-
public Collection<Object> getValues()
436+
public Collection<Object> getValues()
437437
{
438438
return this.wwd.getValues();
439439
}
440440

441441
@Override
442-
public Set<Map.Entry<String, Object>> getEntries()
442+
public Set<Map.Entry<String, Object>> getEntries()
443443
{
444444
return this.wwd.getEntries();
445445
}
446446

447447
@Override
448-
public String getStringValue(String key)
448+
public String getStringValue(String key)
449449
{
450450
return this.wwd.getStringValue(key);
451451
}
452452

453453
@Override
454-
public boolean hasKey(String key)
454+
public boolean hasKey(String key)
455455
{
456456
return this.wwd.hasKey(key);
457457
}
458458

459459
@Override
460-
public Object removeKey(String key)
460+
public Object removeKey(String key)
461461
{
462462
return this.wwd.removeKey(key);
463463
}
@@ -493,52 +493,58 @@ public void firePropertyChange(String propertyName, Object oldValue, Object newV
493493
}
494494

495495
@Override
496-
public void firePropertyChange(PropertyChangeEvent propertyChangeEvent)
496+
public void firePropertyChange(PropertyChangeEvent propertyChangeEvent)
497497
{
498498
this.wwd.firePropertyChange(propertyChangeEvent);
499499
}
500500

501501
@Override
502-
public AVList copy()
502+
public AVList copy()
503503
{
504504
return this.wwd.copy();
505505
}
506506

507507
@Override
508-
public AVList clearList()
508+
public AVList clearList()
509509
{
510510
return this.wwd.clearList();
511511
}
512512

513513
@Override
514-
public void setPerFrameStatisticsKeys(Set<String> keys)
514+
public void setPerFrameStatisticsKeys(Set<String> keys)
515515
{
516516
this.wwd.setPerFrameStatisticsKeys(keys);
517517
}
518518

519519
@Override
520-
public Collection<PerformanceStatistic> getPerFrameStatistics()
520+
public Collection<PerformanceStatistic> getPerFrameStatistics()
521521
{
522522
return this.wwd.getPerFrameStatistics();
523523
}
524-
524+
525525
/**
526526
* @return current mouse pointer position in GL surface screen coordinates.
527527
*/
528528
@Override
529-
public Point getMousePosition() throws HeadlessException {
530-
Point mpos = super.getMousePosition();
531-
int [] awtPt = { mpos.x, mpos.y };
532-
533-
if (wwd.getContext() == null) return mpos;
534-
535-
GLDrawable drawable = wwd.getContext().getGLDrawable();
536-
if (drawable == null) return mpos;
537-
538-
// Convert to GL surface coordinates
539-
int [] glSurfacePt = drawable.getNativeSurface().convertToPixelUnits(awtPt);
540-
int glSurfaceHeight = drawable.getSurfaceHeight();
541-
glSurfacePt[1] = glSurfaceHeight - glSurfacePt[1] - 1;
542-
return new Point(glSurfacePt[0], glSurfacePt[1]);
529+
public Point getMousePosition() throws HeadlessException
530+
{
531+
Point mpos = super.getMousePosition();
532+
int[] awtPt =
533+
{
534+
mpos.x, mpos.y
535+
};
536+
537+
if (wwd.getContext() == null)
538+
return mpos;
539+
540+
GLDrawable drawable = wwd.getContext().getGLDrawable();
541+
if (drawable == null)
542+
return mpos;
543+
544+
// Convert to GL surface coordinates
545+
int[] glSurfacePt = drawable.getNativeSurface().convertToPixelUnits(awtPt);
546+
int glSurfaceHeight = drawable.getSurfaceHeight();
547+
glSurfacePt[1] = glSurfaceHeight - glSurfacePt[1] - 1;
548+
return new Point(glSurfacePt[0], glSurfacePt[1]);
543549
}
544550
}

0 commit comments

Comments
 (0)
0