[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine: [3684] VASSAL-src/trunk/src/VASSAL/counters/ Obscurable.java

[<uck...@us...>]

Revision: 3684
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=3684&view=rev
Author:   uckelman
Date:     2008-05-30 09:12:32 -0700 (Fri, 30 May 2008)

Log Message:
-----------
Merged swampwallaby-work 3621.
Revert hiding of Obscured Properties.

Modified Paths:
--------------
    VASSAL-src/trunk/src/VASSAL/counters/Obscurable.java

Modified: VASSAL-src/trunk/src/VASSAL/counters/Obscurable.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/counters/Obscurable.java	2008-05-30 16:06:39 UTC (rev 3683)
+++ VASSAL-src/trunk/src/VASSAL/counters/Obscurable.java	2008-05-30 16:12:32 UTC (rev 3684)
@@ -248,26 +248,29 @@
     else if (Properties.VISIBLE_STATE.equals(key)) {
       return myGetState()+isPeeking()+piece.getProperty(key);
     }
+    // FIXME: Access to Obscured properties 
     // If piece is obscured to me, then mask any properties returned by
     // traits between this one and the innermost BasicPiece. Return directly
     // any properties normally handled by Decorator.getproperty()
-    else if (obscuredToMe()) {
-      if (Properties.KEY_COMMANDS.equals(key)) {
-        return getKeyCommands();
-      }
-      else if (Properties.INNER.equals(key)) {
-        return piece;
-      }
-      else if (Properties.OUTER.equals(key)) {
-        return getOuter();
-      }
-      else if (Properties.VISIBLE_STATE.equals(key)) {
-        return myGetState();
-      }
-      else {
-        return ((BasicPiece) Decorator.getInnermost(this)).getPublicProperty(key);
-      }
-    }
+    // Global Key Commands acting on Decks over-ride the masking by calling
+    // setExposeMaskedProperties()
+//    else if (obscuredToMe() && ! exposeMaskedProperties) {
+//      if (Properties.KEY_COMMANDS.equals(key)) {
+//        return getKeyCommands();
+//      }
+//      else if (Properties.INNER.equals(key)) {
+//        return piece;
+//      }
+//      else if (Properties.OUTER.equals(key)) {
+//        return getOuter();
+//      }
+//      else if (Properties.VISIBLE_STATE.equals(key)) {
+//        return myGetState();
+//      }
+//      else {
+//        return ((BasicPiece) Decorator.getInnermost(this)).getPublicProperty(key);
+//      }
+//    }
     else {
       return super.getProperty(key);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
vassalengine-svn mailing list
vas...@li...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn