Author: simoneg
Date: Wed Jun 27 17:46:49 2012
New Revision: 1354645
URL: http://svn.apache.org/viewvc?rev=1354645&view=rev
Log:
Fixed case of layer ALL for expandedLayers
Modified:
labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/ViewSettings.java
Modified:
labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/ViewSettings.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/ViewSettings.java?rev=1354645&r1=1354644&r2=1354645&view=diff
==============================================================================
---
labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/ViewSettings.java
(original)
+++
labs/magma/trunk/foundation-beans-view/src/main/java/org/apache/magma/view/ViewSettings.java
Wed Jun 27 17:46:49 2012
@@ -100,9 +100,11 @@ public class ViewSettings {
this.expanded = expanded;
}
- private boolean isOnLayer(String[] layers, String layer, boolean
defLayer) {
- if (layer.equalsIgnoreCase(MagDefaultLayers.ALL)) return true;
- if (layer.equalsIgnoreCase(MagDefaultLayers.DEFAULT)) return
defLayer;
+ private boolean isOnLayer(String[] layers, String layer, boolean
useDefs) {
+ if (useDefs) {
+ if (layer.equalsIgnoreCase(MagDefaultLayers.ALL))
return true;
+ if (layer.equalsIgnoreCase(MagDefaultLayers.DEFAULT))
return this.defaultLayer;
+ }
if (layers == null) return false;
for (String aclayer : layers) {
if (aclayer.equalsIgnoreCase(layer)) return true;
@@ -110,13 +112,13 @@ public class ViewSettings {
return false;
}
- private boolean isOnAnyLayer(String[] allLayers, String[] layers,
boolean defLayer) {
+ private boolean isOnAnyLayer(String[] allLayers, String[] layers,
boolean useDefs) {
boolean res = false;
for (String aclayer : layers) {
if (aclayer.charAt(0) == '!') {
- if (isOnLayer(allLayers, aclayer.substring(1),
defLayer)) return false;
+ if (isOnLayer(allLayers, aclayer.substring(1),
useDefs)) return false;
} else {
- if (isOnLayer(allLayers, aclayer, defLayer))
res = true;
+ if (isOnLayer(allLayers, aclayer, useDefs)) res
= true;
}
}
return res;
@@ -124,11 +126,11 @@ public class ViewSettings {
public boolean isOnLayer(String layer) {
- return isOnLayer(this.layers, layer, this.defaultLayer);
+ return isOnLayer(this.layers, layer, true);
}
public boolean isOnAnyLayer(String[] layers) {
- return isOnAnyLayer(this.layers, layers, this.defaultLayer);
+ return isOnAnyLayer(this.layers, layers, true);
}
public String[] getExpandedLayers() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
