From f2cc174f1d8b6b37351dc96071d37bbd897b2d98 Mon Sep 17 00:00:00 2001 From: GabrielDS Date: Thu, 13 Jul 2017 19:46:00 -0300 Subject: [PATCH 1/2] Removed trailing whitespaces --- src/com/zebraimaging/ZebraInputHandler.java | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/com/zebraimaging/ZebraInputHandler.java b/src/com/zebraimaging/ZebraInputHandler.java index 1e855876b8..7fe937c110 100644 --- a/src/com/zebraimaging/ZebraInputHandler.java +++ b/src/com/zebraimaging/ZebraInputHandler.java @@ -19,28 +19,28 @@ public class ZebraInputHandler extends AWTInputHandler /** All instantiations of this class are stored for internal retrieval. */ private static List instances = new ArrayList(); private static Timer repaintContextsTimer = null; - + final static TimerTask repaintContextsTask = new TimerTask() { - public void run() + public void run() { Iterator itr = instances.iterator(); while (itr.hasNext()) { - ZebraInputHandler h = itr.next(); + ZebraInputHandler h = itr.next(); if (h.NeedsRefresh() == true) { h.SetRefresh(false); h.getWorldWindow().redraw(); - } + } } } }; - + private long hwnd = 0; - private boolean arGL2Present = false; + private boolean arGL2Present = false; private boolean refresh = false; - + public ZebraInputHandler() { /** @@ -49,7 +49,7 @@ public ZebraInputHandler() * (b) Not using the Zebra integration tools. */ try - { + { System.loadLibrary("arGL2Integrator"); arGL2Present = true; instances.add(this); @@ -59,7 +59,7 @@ public ZebraInputHandler() { System.out.println("FAILED to load arGL2Integrator.dll"); } - + if (repaintContextsTimer == null) { repaintContextsTimer = new Timer(); @@ -68,15 +68,15 @@ public ZebraInputHandler() } private synchronized void SetRefresh(boolean value) - { + { refresh = value; } - + private synchronized boolean NeedsRefresh() { return refresh; } - + public void keyPressed(KeyEvent e) { boolean consumed = false; @@ -198,7 +198,7 @@ private static ZebraInputHandler getInstance(long hwnd) // Java static methods executed by arGL2Integrator.dll via JNI public static void forceRepaint(long hwnd) - { + { /** Force the instance of the ZebraViewInputHandler class to redraw it's associated OpenGL window. */ ZebraInputHandler h = getInstance(hwnd); if (h != null) From 2572069dd313653c6d2bbf97a7d1c927515654f9 Mon Sep 17 00:00:00 2001 From: GabrielDS Date: Thu, 13 Jul 2017 20:04:34 -0300 Subject: [PATCH 2/2] =?UTF-8?q?Remove=20some=20trailing=20whitespaces?= =?UTF-8?q?=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gov/nasa/worldwind/Restorable.java | 2 +- src/gov/nasa/worldwind/animation/AngleAnimator.java | 4 +--- src/gov/nasa/worldwind/animation/AnimationController.java | 2 +- src/gov/nasa/worldwind/animation/BasicAnimator.java | 2 +- src/gov/nasa/worldwind/animation/DoubleAnimator.java | 4 ++-- src/gov/nasa/worldwind/animation/PositionAnimator.java | 4 ++-- src/gov/nasa/worldwind/animation/SmoothInterpolator.java | 2 +- .../nasa/worldwind/view/firstperson/FlyViewInputHandler.java | 4 ++-- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/gov/nasa/worldwind/Restorable.java b/src/gov/nasa/worldwind/Restorable.java index ea3d0c9eb5..669835be27 100644 --- a/src/gov/nasa/worldwind/Restorable.java +++ b/src/gov/nasa/worldwind/Restorable.java @@ -27,7 +27,7 @@ public interface Restorable /** * Returns an XML document string describing the object's state. This state can be restored later by calling * restoreState and passing the XML document. - * + * * @return an XML document string describing the object's state. */ String getRestorableState(); diff --git a/src/gov/nasa/worldwind/animation/AngleAnimator.java b/src/gov/nasa/worldwind/animation/AngleAnimator.java index 3125354726..b62b12a384 100644 --- a/src/gov/nasa/worldwind/animation/AngleAnimator.java +++ b/src/gov/nasa/worldwind/animation/AngleAnimator.java @@ -112,7 +112,7 @@ public Angle getEnd() /** * Get the {@link gov.nasa.worldwind.util.PropertyAccessor} in use by this animation - * + * * @return the {@link gov.nasa.worldwind.util.PropertyAccessor} in use by this animation */ public PropertyAccessor.AngleAccessor getPropertyAccessor() @@ -150,7 +150,5 @@ private Angle nextAngle(double interpolant) interpolant, this.begin, this.end); - - } } diff --git a/src/gov/nasa/worldwind/animation/AnimationController.java b/src/gov/nasa/worldwind/animation/AnimationController.java index 5eef377394..8d0d1ce603 100644 --- a/src/gov/nasa/worldwind/animation/AnimationController.java +++ b/src/gov/nasa/worldwind/animation/AnimationController.java @@ -84,7 +84,7 @@ public boolean stepAnimators() /** * Returns true if the controller has any active Animations - * + * * @return true if there are any active animations in this CompountAnimation */ public boolean hasActiveAnimation() diff --git a/src/gov/nasa/worldwind/animation/BasicAnimator.java b/src/gov/nasa/worldwind/animation/BasicAnimator.java index cff870e8a1..4ed8970ccf 100644 --- a/src/gov/nasa/worldwind/animation/BasicAnimator.java +++ b/src/gov/nasa/worldwind/animation/BasicAnimator.java @@ -27,7 +27,7 @@ public class BasicAnimator implements Animator /** * Constructs a BasicAnimator. Sets the Animator's Interpolator to - * null. + * null. */ public BasicAnimator() { diff --git a/src/gov/nasa/worldwind/animation/DoubleAnimator.java b/src/gov/nasa/worldwind/animation/DoubleAnimator.java index bb33a91405..444d8ad742 100644 --- a/src/gov/nasa/worldwind/animation/DoubleAnimator.java +++ b/src/gov/nasa/worldwind/animation/DoubleAnimator.java @@ -28,7 +28,7 @@ public DoubleAnimator(Interpolator interpolator, { this.interpolator = new ScheduledInterpolator(10000); } - + if (propertyAccessor == null) { String message = Logging.getMessage("nullValue.ViewPropertyAccessorIsNull"); @@ -90,5 +90,5 @@ public Double nextDouble(double interpolant) this.end); } - + } diff --git a/src/gov/nasa/worldwind/animation/PositionAnimator.java b/src/gov/nasa/worldwind/animation/PositionAnimator.java index 14645e7518..acc5fdceb3 100644 --- a/src/gov/nasa/worldwind/animation/PositionAnimator.java +++ b/src/gov/nasa/worldwind/animation/PositionAnimator.java @@ -14,7 +14,7 @@ */ public class PositionAnimator extends BasicAnimator { - + protected Position begin; protected Position end; protected final PropertyAccessor.PositionAccessor propertyAccessor; @@ -47,7 +47,7 @@ public PositionAnimator( this.end = end; this.propertyAccessor = propertyAccessor; } - + public void setBegin(Position begin) { this.begin = begin; diff --git a/src/gov/nasa/worldwind/animation/SmoothInterpolator.java b/src/gov/nasa/worldwind/animation/SmoothInterpolator.java index d6d9fbc499..456360d1cb 100644 --- a/src/gov/nasa/worldwind/animation/SmoothInterpolator.java +++ b/src/gov/nasa/worldwind/animation/SmoothInterpolator.java @@ -42,5 +42,5 @@ protected static double basicInterpolant(double interpolant, double startInterpo // ============== Helper Functions ======================= // // Map amount range [startAmount, stopAmount] to [0, 1] when amount is inside range. - + } diff --git a/src/gov/nasa/worldwind/view/firstperson/FlyViewInputHandler.java b/src/gov/nasa/worldwind/view/firstperson/FlyViewInputHandler.java index 3637ad96a7..7755cb6916 100644 --- a/src/gov/nasa/worldwind/view/firstperson/FlyViewInputHandler.java +++ b/src/gov/nasa/worldwind/view/firstperson/FlyViewInputHandler.java @@ -76,7 +76,7 @@ public boolean inputActionPerformed(AbstractViewInputHandler inputHandler, KeyEv } return true; } - } + } AnimationController uiAnimControl = new AnimationController(); AnimationController gotoAnimControl = new AnimationController(); @@ -182,7 +182,7 @@ public FlyViewInputHandler() RollActionListener rollActionListener = new RollActionListener(); this.getAttributes().setActionListener( ViewInputAttributes.DEVICE_KEYBOARD, ViewInputAttributes.VIEW_ROLL_KEYS, rollActionListener); - + // Arrow Keys horizontal translate this.getAttributes().setValues(ViewInputAttributes.DEVICE_KEYBOARD, ViewInputAttributes.VIEW_HORIZONTAL_TRANS_KEYS,